Brian Behlendorf
|
ee042a8f27
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-12-11 16:52:24 -08:00 |
|
Brian Behlendorf
|
5848ca32dd
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:52:19 -08:00 |
|
Brian Behlendorf
|
7f36e17c7b
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-12-11 16:52:17 -08:00 |
|
Brian Behlendorf
|
0cf0b27968
|
Add man pages to the build system and packages.
|
2009-12-11 16:49:25 -08:00 |
|
Brian Behlendorf
|
e9b61bbe82
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:24:13 -08:00 |
|
Brian Behlendorf
|
2fb657e29a
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-12-11 16:24:11 -08:00 |
|
Brian Behlendorf
|
5b1b1d1f59
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:24:06 -08:00 |
|
Brian Behlendorf
|
34aa2ace68
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-12-11 16:24:04 -08:00 |
|
Brian Behlendorf
|
f2e3776019
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:23:59 -08:00 |
|
Brian Behlendorf
|
90f7449a5b
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-12-11 16:23:57 -08:00 |
|
Brian Behlendorf
|
baa85fd1ba
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:23:52 -08:00 |
|
Brian Behlendorf
|
d4c42b8703
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-12-11 16:23:50 -08:00 |
|
Brian Behlendorf
|
a9199b6751
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:23:45 -08:00 |
|
Brian Behlendorf
|
4fdebcdb85
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-12-11 16:23:43 -08:00 |
|
Brian Behlendorf
|
6e75909110
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:23:38 -08:00 |
|
Brian Behlendorf
|
8d7b7a0f07
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-12-11 16:23:36 -08:00 |
|
Brian Behlendorf
|
f8181800e3
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:23:31 -08:00 |
|
Brian Behlendorf
|
6e6114b7b8
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-12-11 16:23:29 -08:00 |
|
Brian Behlendorf
|
4db022450b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:23:24 -08:00 |
|
Brian Behlendorf
|
e5c4168ece
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-12-11 16:23:22 -08:00 |
|
Brian Behlendorf
|
713e850b12
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:23:16 -08:00 |
|
Brian Behlendorf
|
7eebafc2d6
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-12-11 16:23:14 -08:00 |
|
Brian Behlendorf
|
7c8c0a6179
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:23:09 -08:00 |
|
Brian Behlendorf
|
6e2e4120bf
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-12-11 16:23:07 -08:00 |
|
Brian Behlendorf
|
51dd8e8cd9
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:23:02 -08:00 |
|
Brian Behlendorf
|
561d26cc61
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-12-11 16:23:00 -08:00 |
|
Brian Behlendorf
|
ffc4ae62e0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-12-11 16:22:59 -08:00 |
|
Brian Behlendorf
|
6326bebc16
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:22:50 -08:00 |
|
Brian Behlendorf
|
72a1b57f40
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-12-11 16:22:48 -08:00 |
|
Brian Behlendorf
|
5c4bb12e1f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:22:43 -08:00 |
|
Brian Behlendorf
|
f5066b42cc
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-12-11 16:22:40 -08:00 |
|
Brian Behlendorf
|
268b3dafaf
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:22:35 -08:00 |
|
Brian Behlendorf
|
bf6d5aacdc
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-12-11 16:22:32 -08:00 |
|
Brian Behlendorf
|
c0abfb43b0
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-12-11 16:22:27 -08:00 |
|
Brian Behlendorf
|
455a6dafa4
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-12-11 16:22:25 -08:00 |
|
Brian Behlendorf
|
77825f6f77
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-12-11 16:22:24 -08:00 |
|
Brian Behlendorf
|
9b6685297c
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-12-11 16:22:23 -08:00 |
|
Brian Behlendorf
|
381e48a2d8
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-12-11 16:22:22 -08:00 |
|
Brian Behlendorf
|
bd452887b8
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2009-12-11 16:22:22 -08:00 |
|
Brian Behlendorf
|
6d7c81fc7a
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-12-11 16:22:22 -08:00 |
|
Brian Behlendorf
|
f2fd9d7728
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2009-12-11 16:22:21 -08:00 |
|
Brian Behlendorf
|
dc64c3498b
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2009-12-11 16:22:20 -08:00 |
|
Brian Behlendorf
|
4a2898bfa0
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-12-11 16:22:19 -08:00 |
|
Brian Behlendorf
|
453a9ae205
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-12-11 16:22:17 -08:00 |
|
Brian Behlendorf
|
769218cc9a
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-12-11 16:22:16 -08:00 |
|
Brian Behlendorf
|
73672e0b66
|
Merge commit 'refs/top-bases/fix-acl' into fix-acl
|
2009-12-11 16:22:15 -08:00 |
|
Brian Behlendorf
|
ef72feceef
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2009-12-11 16:22:15 -08:00 |
|
Brian Behlendorf
|
39ea68ffcc
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2009-12-11 16:22:13 -08:00 |
|
Brian Behlendorf
|
9e22d4e163
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2009-12-11 16:22:13 -08:00 |
|
Brian Behlendorf
|
13ef957f1f
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2009-12-11 16:22:12 -08:00 |