Brian Behlendorf
|
8b6083604f
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:32:37 -08:00 |
Brian Behlendorf
|
90b73736b6
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-10 13:32:35 -08:00 |
Brian Behlendorf
|
7be463025e
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:32:32 -08:00 |
Brian Behlendorf
|
3b59a00df0
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-10 13:32:31 -08:00 |
Brian Behlendorf
|
51641ea723
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:32:27 -08:00 |
Brian Behlendorf
|
23bc3f6ed7
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-10 13:32:26 -08:00 |
Brian Behlendorf
|
3cf04bc939
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:32:22 -08:00 |
Brian Behlendorf
|
5bcc6840ba
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-10 13:32:21 -08:00 |
Brian Behlendorf
|
c07fbfcc71
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:32:17 -08:00 |
Brian Behlendorf
|
244b7f3c71
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-10 13:32:16 -08:00 |
Brian Behlendorf
|
05399b6f6d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:32:12 -08:00 |
Brian Behlendorf
|
b04adc9d17
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-10 13:32:10 -08:00 |
Brian Behlendorf
|
390d4a8f93
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:32:07 -08:00 |
Brian Behlendorf
|
e03a6b8fa1
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-10 13:32:06 -08:00 |
Brian Behlendorf
|
d08affc5b5
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:32:02 -08:00 |
Brian Behlendorf
|
61e6f29ba7
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-10 13:32:01 -08:00 |
Brian Behlendorf
|
b0026c1d0f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-10 13:32:00 -08:00 |
Brian Behlendorf
|
41bff0b007
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:31:54 -08:00 |
Brian Behlendorf
|
8bdc2cccf3
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-10 13:31:53 -08:00 |
Brian Behlendorf
|
7a29405676
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-10 13:31:52 -08:00 |
Brian Behlendorf
|
aa05fe67f0
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:31:46 -08:00 |
Brian Behlendorf
|
9cf076706b
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-10 13:31:45 -08:00 |
Brian Behlendorf
|
e2470d9b7c
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:31:41 -08:00 |
Brian Behlendorf
|
93bc87137d
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-10 13:31:40 -08:00 |
Brian Behlendorf
|
ee3c9f95cb
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:31:36 -08:00 |
Brian Behlendorf
|
184a875486
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-10 13:31:35 -08:00 |
Brian Behlendorf
|
8003089e8b
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:31:32 -08:00 |
Brian Behlendorf
|
7279a7be6a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-10 13:31:30 -08:00 |
Brian Behlendorf
|
e62fccdfe8
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:31:27 -08:00 |
Brian Behlendorf
|
0bec736bef
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-10 13:31:25 -08:00 |
Brian Behlendorf
|
0f20337d67
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:31:22 -08:00 |
Brian Behlendorf
|
962a43335f
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-10 13:31:21 -08:00 |
Brian Behlendorf
|
44c9da27c2
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-10 13:31:18 -08:00 |
Brian Behlendorf
|
64ecae61af
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-10 13:31:16 -08:00 |
Brian Behlendorf
|
914669907b
|
Change -lzport to -lspl
|
2008-12-10 13:29:14 -08:00 |
Brian Behlendorf
|
be5660e8f6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:56:20 -08:00 |
Brian Behlendorf
|
04e9ac0287
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-10 12:56:19 -08:00 |
Brian Behlendorf
|
ad24676de2
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:56:15 -08:00 |
Brian Behlendorf
|
8978919d1b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-10 12:56:13 -08:00 |
Brian Behlendorf
|
f27bda146c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:56:09 -08:00 |
Brian Behlendorf
|
799ca66c5c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-10 12:56:08 -08:00 |
Brian Behlendorf
|
ea0118d21d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:56:04 -08:00 |
Brian Behlendorf
|
1d2faebc52
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-10 12:56:02 -08:00 |
Brian Behlendorf
|
201a2064e6
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:58 -08:00 |
Brian Behlendorf
|
ebc051bc0c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-10 12:55:56 -08:00 |
Brian Behlendorf
|
697259baa2
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:52 -08:00 |
Brian Behlendorf
|
f4b7370044
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-10 12:55:51 -08:00 |
Brian Behlendorf
|
3a036e301d
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:47 -08:00 |
Brian Behlendorf
|
5598924534
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-10 12:55:45 -08:00 |
Brian Behlendorf
|
f5e4a76a95
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:41 -08:00 |