Brian Behlendorf
|
795b008d80
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-07 16:35:18 -07:00 |
|
Brian Behlendorf
|
f5f48f7488
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:35:09 -07:00 |
|
Brian Behlendorf
|
85f46e8651
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-07 16:35:05 -07:00 |
|
Brian Behlendorf
|
25483b5fea
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:34:56 -07:00 |
|
Brian Behlendorf
|
6c28ebf45a
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-07 16:34:53 -07:00 |
|
Brian Behlendorf
|
e219b71123
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:34:44 -07:00 |
|
Brian Behlendorf
|
8372b28c6b
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-07 16:34:41 -07:00 |
|
Brian Behlendorf
|
ff0eefa7ef
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:34:29 -07:00 |
|
Brian Behlendorf
|
dd1e80c3c5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-07 16:34:26 -07:00 |
|
Brian Behlendorf
|
aa20ef9d9c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:34:17 -07:00 |
|
Brian Behlendorf
|
2638e12036
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-07 16:34:13 -07:00 |
|
Brian Behlendorf
|
3e968bdbb8
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:34:05 -07:00 |
|
Brian Behlendorf
|
e192fc13d7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-07 16:34:02 -07:00 |
|
Brian Behlendorf
|
f0728da425
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:33:51 -07:00 |
|
Brian Behlendorf
|
e22e825bf9
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-07 16:33:48 -07:00 |
|
Brian Behlendorf
|
cda82d797e
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:33:38 -07:00 |
|
Brian Behlendorf
|
dc5a90a00d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-07 16:33:35 -07:00 |
|
Brian Behlendorf
|
e284901877
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:33:26 -07:00 |
|
Brian Behlendorf
|
b9813a2a75
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-07 16:33:24 -07:00 |
|
Brian Behlendorf
|
66cbbf90b4
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:33:12 -07:00 |
|
Brian Behlendorf
|
056bbc39b4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-07 16:33:10 -07:00 |
|
Brian Behlendorf
|
0241dbe8ca
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:33:01 -07:00 |
|
Brian Behlendorf
|
6bc6e35298
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-07 16:32:58 -07:00 |
|
Brian Behlendorf
|
8028fd5db5
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-07 16:32:57 -07:00 |
|
Brian Behlendorf
|
dec51552c6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:32:38 -07:00 |
|
Brian Behlendorf
|
68a0ba0bc3
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-07 16:32:35 -07:00 |
|
Brian Behlendorf
|
deacdbc785
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 16:32:34 -07:00 |
|
Brian Behlendorf
|
60c626035d
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:32:18 -07:00 |
|
Brian Behlendorf
|
c20c6fa4c4
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-07 16:32:14 -07:00 |
|
Brian Behlendorf
|
92675ed868
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:32:03 -07:00 |
|
Brian Behlendorf
|
0dc735a580
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-07 16:32:00 -07:00 |
|
Brian Behlendorf
|
217f42c421
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:31:52 -07:00 |
|
Brian Behlendorf
|
3745fe979b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-07 16:31:48 -07:00 |
|
Brian Behlendorf
|
56216112df
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:31:40 -07:00 |
|
Brian Behlendorf
|
f1386d1aea
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-07 16:31:37 -07:00 |
|
Brian Behlendorf
|
a557b6ae3c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:31:25 -07:00 |
|
Brian Behlendorf
|
3c42220ce1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-07 16:31:22 -07:00 |
|
Brian Behlendorf
|
be5d40865b
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:31:13 -07:00 |
|
Brian Behlendorf
|
03957283a5
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-07 16:31:10 -07:00 |
|
Brian Behlendorf
|
67e2052f52
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:31:01 -07:00 |
|
Brian Behlendorf
|
b6cf87b32d
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-07 16:30:58 -07:00 |
|
Brian Behlendorf
|
0a00d10c24
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 16:30:57 -07:00 |
|
Brian Behlendorf
|
02362668ac
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 16:30:56 -07:00 |
|
Brian Behlendorf
|
d515750ecf
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-07 16:30:55 -07:00 |
|
Brian Behlendorf
|
24daf7747f
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-07-07 16:30:54 -07:00 |
|
Brian Behlendorf
|
0e310d30de
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-07-07 16:30:54 -07:00 |
|
Brian Behlendorf
|
10dcf485d3
|
First fit allocator unused comment it out.
|
2009-07-07 16:23:09 -07:00 |
|
Brian Behlendorf
|
ebda366c1c
|
Add missing case introduced by rebase.
|
2009-07-07 16:22:33 -07:00 |
|
Brian Behlendorf
|
eb753aca11
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:13:37 -07:00 |
|
Brian Behlendorf
|
b8eeb71363
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-07 16:13:35 -07:00 |