Brian Behlendorf
|
863ec76ff7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 12:45:53 -08:00 |
|
Brian Behlendorf
|
941e464645
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 12:45:52 -08:00 |
|
Brian Behlendorf
|
54587036c1
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 12:45:51 -08:00 |
|
Brian Behlendorf
|
a1b865abee
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 12:45:51 -08:00 |
|
Brian Behlendorf
|
da718dd80a
|
Resolve shadow conflict
|
2008-12-17 12:42:17 -08:00 |
|
Brian Behlendorf
|
1a50fc5480
|
Resolve collision
|
2008-12-17 12:40:17 -08:00 |
|
Brian Behlendorf
|
ce5f947d28
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:30:13 -08:00 |
|
Brian Behlendorf
|
0c40f1b26f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 12:30:11 -08:00 |
|
Brian Behlendorf
|
73fd40a276
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:30:04 -08:00 |
|
Brian Behlendorf
|
c4036a7293
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 12:30:03 -08:00 |
|
Brian Behlendorf
|
df6f7eb2b1
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:29:57 -08:00 |
|
Brian Behlendorf
|
6e6e04c73c
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 12:29:54 -08:00 |
|
Brian Behlendorf
|
2c5f534c14
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:29:49 -08:00 |
|
Brian Behlendorf
|
0e13fd4e60
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 12:29:46 -08:00 |
|
Brian Behlendorf
|
74f37073a6
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:29:41 -08:00 |
|
Brian Behlendorf
|
8cfc6c6ef3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 12:29:38 -08:00 |
|
Brian Behlendorf
|
d37d158446
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:29:33 -08:00 |
|
Brian Behlendorf
|
dddf294772
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 12:29:30 -08:00 |
|
Brian Behlendorf
|
4a6430c029
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:29:25 -08:00 |
|
Brian Behlendorf
|
f22f1528f5
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 12:29:22 -08:00 |
|
Brian Behlendorf
|
d13c678159
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:29:16 -08:00 |
|
Brian Behlendorf
|
e885dd3a7d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 12:29:14 -08:00 |
|
Brian Behlendorf
|
355028728e
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:29:09 -08:00 |
|
Brian Behlendorf
|
75bd3d3fae
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 12:29:06 -08:00 |
|
Brian Behlendorf
|
cea67775e7
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:28:59 -08:00 |
|
Brian Behlendorf
|
387d87ba54
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 12:28:56 -08:00 |
|
Brian Behlendorf
|
a69a002c09
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:28:50 -08:00 |
|
Brian Behlendorf
|
f430f3f774
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 12:28:47 -08:00 |
|
Brian Behlendorf
|
4cf46503c2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:28:40 -08:00 |
|
Brian Behlendorf
|
7881d6e148
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 12:28:37 -08:00 |
|
Brian Behlendorf
|
632a5dc58b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 12:28:36 -08:00 |
|
Brian Behlendorf
|
f149b0dd5a
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:28:25 -08:00 |
|
Brian Behlendorf
|
5c220cf49c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 12:28:22 -08:00 |
|
Brian Behlendorf
|
42752f2339
|
Resolve conflict
|
2008-12-17 12:28:15 -08:00 |
|
Brian Behlendorf
|
17c3ef256f
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:26:48 -08:00 |
|
Brian Behlendorf
|
55b0194547
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 12:26:44 -08:00 |
|
Brian Behlendorf
|
474e36301a
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:26:39 -08:00 |
|
Brian Behlendorf
|
19e2c1dddc
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 12:26:36 -08:00 |
|
Brian Behlendorf
|
f137c8b178
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:26:31 -08:00 |
|
Brian Behlendorf
|
1ec086ef77
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 12:26:27 -08:00 |
|
Brian Behlendorf
|
5e8c402b52
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:26:22 -08:00 |
|
Brian Behlendorf
|
fe7db8545d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 12:26:20 -08:00 |
|
Brian Behlendorf
|
fec43b82e6
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:26:15 -08:00 |
|
Brian Behlendorf
|
0a21fc4a03
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 12:26:11 -08:00 |
|
Brian Behlendorf
|
755d93f3f6
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:26:05 -08:00 |
|
Brian Behlendorf
|
49f0a3a3cd
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 12:26:01 -08:00 |
|
Brian Behlendorf
|
9129b436bb
|
Resolve conflict
|
2008-12-17 12:24:50 -08:00 |
|
Brian Behlendorf
|
68e8258d8e
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 12:24:00 -08:00 |
|
Brian Behlendorf
|
5fa2d90840
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 12:23:59 -08:00 |
|
Brian Behlendorf
|
9ef6211ce7
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 12:23:57 -08:00 |