Brian Behlendorf
|
64a9f434f4
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:46:56 -07:00 |
|
Brian Behlendorf
|
f20fd4c00e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-05-18 14:46:54 -07:00 |
|
Brian Behlendorf
|
bcc5de8c52
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:46:46 -07:00 |
|
Brian Behlendorf
|
6bf8be4107
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-18 14:46:45 -07:00 |
|
Brian Behlendorf
|
ebac557883
|
Revert accidental change to COPYING, move authors to master branch.
|
2010-05-18 14:41:47 -07:00 |
|
Brian Behlendorf
|
be4cfe7409
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:35:56 -07:00 |
|
Brian Behlendorf
|
b47b5e68d9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-18 14:35:54 -07:00 |
|
Brian Behlendorf
|
a2e9c56a90
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-05-18 14:35:53 -07:00 |
|
Brian Behlendorf
|
59ee80ce54
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:35:39 -07:00 |
|
Brian Behlendorf
|
2db5b6c7d3
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-18 14:35:37 -07:00 |
|
Brian Behlendorf
|
a77467df19
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:35:29 -07:00 |
|
Brian Behlendorf
|
400f621711
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-18 14:35:27 -07:00 |
|
Brian Behlendorf
|
f04f3903f0
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:35:20 -07:00 |
|
Brian Behlendorf
|
4510e333eb
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-18 14:35:18 -07:00 |
|
Brian Behlendorf
|
8115c420a2
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:35:10 -07:00 |
|
Brian Behlendorf
|
cfd40ff10b
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-18 14:35:08 -07:00 |
|
Brian Behlendorf
|
0e44bfff23
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:35:00 -07:00 |
|
Brian Behlendorf
|
3fa1ce1416
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-05-18 14:34:59 -07:00 |
|
Brian Behlendorf
|
7b6dd52749
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:34:51 -07:00 |
|
Brian Behlendorf
|
99826a62d5
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-05-18 14:34:49 -07:00 |
|
Brian Behlendorf
|
106cc465cc
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:34:41 -07:00 |
|
Brian Behlendorf
|
2b38f43752
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-05-18 14:34:40 -07:00 |
|
Brian Behlendorf
|
4f123adea0
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:34:32 -07:00 |
|
Brian Behlendorf
|
06c5133177
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-05-18 14:34:30 -07:00 |
|
Brian Behlendorf
|
48aee29554
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:34:22 -07:00 |
|
Brian Behlendorf
|
a547c8befa
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-05-18 14:34:20 -07:00 |
|
Brian Behlendorf
|
b7185a77f5
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:34:13 -07:00 |
|
Brian Behlendorf
|
2b90b0cc91
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-05-18 14:34:11 -07:00 |
|
Brian Behlendorf
|
474389ffe0
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:34:03 -07:00 |
|
Brian Behlendorf
|
9a2bebf3ae
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-05-18 14:34:01 -07:00 |
|
Brian Behlendorf
|
a77fc48ee6
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:33:53 -07:00 |
|
Brian Behlendorf
|
63a2daf8f9
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-05-18 14:33:51 -07:00 |
|
Brian Behlendorf
|
eb0501b105
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-05-18 14:33:44 -07:00 |
|
Brian Behlendorf
|
07b79e7271
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-18 14:33:41 -07:00 |
|
Brian Behlendorf
|
7861d7e154
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-05-18 14:33:41 -07:00 |
|
Brian Behlendorf
|
63db2cc5eb
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-18 14:33:40 -07:00 |
|
Brian Behlendorf
|
9e1398d25d
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2010-05-18 14:33:39 -07:00 |
|
Brian Behlendorf
|
92b4c4e4cc
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2010-05-18 14:33:38 -07:00 |
|
Brian Behlendorf
|
2b1b4c6878
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2010-05-18 14:33:38 -07:00 |
|
Brian Behlendorf
|
18ab1a3634
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-05-18 14:33:38 -07:00 |
|
Brian Behlendorf
|
4d159b118d
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2010-05-18 14:33:37 -07:00 |
|
Brian Behlendorf
|
5e840a2f1a
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2010-05-18 14:33:36 -07:00 |
|
Brian Behlendorf
|
5e882a1a26
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2010-05-18 14:33:33 -07:00 |
|
Brian Behlendorf
|
8a6d19b7be
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2010-05-18 14:33:32 -07:00 |
|
Brian Behlendorf
|
bac43a5ed8
|
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
|
2010-05-18 14:33:32 -07:00 |
|
Brian Behlendorf
|
0c8ffbd097
|
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
|
2010-05-18 14:33:31 -07:00 |
|
Brian Behlendorf
|
2a15dc5a26
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2010-05-18 14:33:31 -07:00 |
|
Brian Behlendorf
|
6083ba2858
|
Merge commit 'refs/top-bases/fix-acl' into fix-acl
|
2010-05-18 14:33:30 -07:00 |
|
Brian Behlendorf
|
c1fea7027d
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2010-05-18 14:33:29 -07:00 |
|
Brian Behlendorf
|
8d98096d9a
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2010-05-18 14:33:29 -07:00 |