Brian Behlendorf
|
e335075ce0
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-11-16 10:36:13 -08:00 |
|
Brian Behlendorf
|
9a8e4af989
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-11-16 10:36:11 -08:00 |
|
Brian Behlendorf
|
915205a6e8
|
Add autoconf checks for zvol integration.
|
2009-11-16 10:31:10 -08:00 |
|
Brian Behlendorf
|
c63ee5eb76
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:29:27 -08:00 |
|
Brian Behlendorf
|
4b8bf7722d
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-11-15 16:29:25 -08:00 |
|
Brian Behlendorf
|
2f11df346e
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:29:18 -08:00 |
|
Brian Behlendorf
|
cbca11a498
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-11-15 16:29:17 -08:00 |
|
Brian Behlendorf
|
4c21704657
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:29:10 -08:00 |
|
Brian Behlendorf
|
f913b56263
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-11-15 16:29:08 -08:00 |
|
Brian Behlendorf
|
3eecf16a65
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:29:01 -08:00 |
|
Brian Behlendorf
|
eff1566212
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-11-15 16:29:00 -08:00 |
|
Brian Behlendorf
|
731eb87c68
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:28:53 -08:00 |
|
Brian Behlendorf
|
911692fabb
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-11-15 16:28:51 -08:00 |
|
Brian Behlendorf
|
17fe586a2a
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:28:44 -08:00 |
|
Brian Behlendorf
|
a319cbfd0d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-11-15 16:28:42 -08:00 |
|
Brian Behlendorf
|
9790859637
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:28:35 -08:00 |
|
Brian Behlendorf
|
bb12b54387
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-11-15 16:28:34 -08:00 |
|
Brian Behlendorf
|
f2211566fb
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:28:27 -08:00 |
|
Brian Behlendorf
|
b7b6c7d4df
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-15 16:28:25 -08:00 |
|
Brian Behlendorf
|
caa4b8efb1
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:28:18 -08:00 |
|
Brian Behlendorf
|
5fac7f55be
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-11-15 16:28:16 -08:00 |
|
Brian Behlendorf
|
eed2d2860f
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:28:09 -08:00 |
|
Brian Behlendorf
|
50e6c144e6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-11-15 16:28:08 -08:00 |
|
Brian Behlendorf
|
070829ba08
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:28:00 -08:00 |
|
Brian Behlendorf
|
52f859a6cc
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-11-15 16:27:59 -08:00 |
|
Brian Behlendorf
|
af5810b03a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-11-15 16:27:59 -08:00 |
|
Brian Behlendorf
|
2e8617cb86
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:27:46 -08:00 |
|
Brian Behlendorf
|
c03a7d863c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-11-15 16:27:44 -08:00 |
|
Brian Behlendorf
|
b6c57fe77e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-15 16:27:44 -08:00 |
|
Brian Behlendorf
|
692c53b9c8
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:27:31 -08:00 |
|
Brian Behlendorf
|
dfcbd0caea
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-11-15 16:27:29 -08:00 |
|
Brian Behlendorf
|
d8cc76e47e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:27:22 -08:00 |
|
Brian Behlendorf
|
9065223447
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-11-15 16:27:20 -08:00 |
|
Brian Behlendorf
|
276371cf28
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:27:13 -08:00 |
|
Brian Behlendorf
|
826e82eff2
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-11-15 16:27:12 -08:00 |
|
Brian Behlendorf
|
1b5b05c1c3
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-11-15 16:27:05 -08:00 |
|
Brian Behlendorf
|
868f5ba008
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-11-15 16:27:03 -08:00 |
|
Brian Behlendorf
|
844280cb2c
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-11-15 16:27:02 -08:00 |
|
Brian Behlendorf
|
d00a0ea8a0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-11-15 16:27:02 -08:00 |
|
Brian Behlendorf
|
368cfaefdb
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-11-15 16:27:00 -08:00 |
|
Brian Behlendorf
|
f056747e61
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-11-15 16:27:00 -08:00 |
|
Brian Behlendorf
|
71ccaccb2b
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2009-11-15 16:27:00 -08:00 |
|
Brian Behlendorf
|
475e214ce1
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2009-11-15 16:27:00 -08:00 |
|
Brian Behlendorf
|
8c5797df77
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2009-11-15 16:26:58 -08:00 |
|
Brian Behlendorf
|
65f6d4b712
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-11-15 16:26:58 -08:00 |
|
Brian Behlendorf
|
c53763d2e7
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-11-15 16:26:55 -08:00 |
|
Brian Behlendorf
|
7188068143
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-11-15 16:26:54 -08:00 |
|
Brian Behlendorf
|
ca3aba32bb
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2009-11-15 16:26:54 -08:00 |
|
Brian Behlendorf
|
d9ff087661
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2009-11-15 16:26:53 -08:00 |
|
Brian Behlendorf
|
2985a9c531
|
Merge commit 'refs/top-bases/fix-acl' into fix-acl
|
2009-11-15 16:26:53 -08:00 |