Brian Behlendorf
|
733e68094b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-11 14:04:41 -08:00 |
|
Brian Behlendorf
|
c6074666c7
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:04:36 -08:00 |
|
Brian Behlendorf
|
3ab9fee91c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 14:04:35 -08:00 |
|
Brian Behlendorf
|
105abd8877
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:04:31 -08:00 |
|
Brian Behlendorf
|
d514181ef5
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-11 14:04:30 -08:00 |
|
Brian Behlendorf
|
e6fcedb606
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:04:26 -08:00 |
|
Brian Behlendorf
|
e5faa2fc79
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-11 14:04:24 -08:00 |
|
Brian Behlendorf
|
3ecaf6bf93
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:04:19 -08:00 |
|
Brian Behlendorf
|
37381659fc
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-11 14:04:17 -08:00 |
|
Brian Behlendorf
|
44ffa43709
|
Resolve conflict
|
2008-12-11 14:01:47 -08:00 |
|
Brian Behlendorf
|
4b4ace8cec
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-11 13:57:04 -08:00 |
|
Brian Behlendorf
|
98ce19f04c
|
Update avl, nvpair, spl to unique build dirs
|
2008-12-11 13:54:57 -08:00 |
|
Brian Behlendorf
|
cdbf6c897a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:47:55 -08:00 |
|
Brian Behlendorf
|
8b20091dda
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 11:47:54 -08:00 |
|
Brian Behlendorf
|
727d98bc5a
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:47:46 -08:00 |
|
Brian Behlendorf
|
50d862cf14
|
Resolve conflict
|
2008-12-11 11:47:40 -08:00 |
|
Brian Behlendorf
|
258246b69d
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:37:37 -08:00 |
|
Brian Behlendorf
|
645c51287f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 11:37:35 -08:00 |
|
Brian Behlendorf
|
d8ee4cc860
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:37:28 -08:00 |
|
Brian Behlendorf
|
de2d4da1a4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 11:37:26 -08:00 |
|
Brian Behlendorf
|
d66666f4f2
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:37:18 -08:00 |
|
Brian Behlendorf
|
ba48a8b819
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-11 11:37:17 -08:00 |
|
Brian Behlendorf
|
19c3e259de
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:37:10 -08:00 |
|
Brian Behlendorf
|
1f3ed674fc
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 11:37:08 -08:00 |
|
Brian Behlendorf
|
1b4478018c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:37:01 -08:00 |
|
Brian Behlendorf
|
b8f5b1287e
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-11 11:36:58 -08:00 |
|
Brian Behlendorf
|
05d0180465
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:36:52 -08:00 |
|
Brian Behlendorf
|
11e1ce8c2e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 11:36:50 -08:00 |
|
Brian Behlendorf
|
81548de9a4
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:36:42 -08:00 |
|
Brian Behlendorf
|
076f7c6a5f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 11:36:40 -08:00 |
|
Brian Behlendorf
|
124b567e82
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:36:33 -08:00 |
|
Brian Behlendorf
|
7515df142f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 11:36:31 -08:00 |
|
Brian Behlendorf
|
ceb20abb27
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:36:24 -08:00 |
|
Brian Behlendorf
|
028c2e29e9
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 11:36:22 -08:00 |
|
Brian Behlendorf
|
ef5070a38b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 11:36:17 -08:00 |
|
Brian Behlendorf
|
6d6ad4a92b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:36:07 -08:00 |
|
Brian Behlendorf
|
3c0ff259db
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 11:36:05 -08:00 |
|
Brian Behlendorf
|
5bb8f9ec25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 11:36:00 -08:00 |
|
Brian Behlendorf
|
4cacbc5e76
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:35:50 -08:00 |
|
Brian Behlendorf
|
4003bc5b2c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 11:35:48 -08:00 |
|
Brian Behlendorf
|
ac4a97dd76
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:35:41 -08:00 |
|
Brian Behlendorf
|
f8d8601f31
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-11 11:35:39 -08:00 |
|
Brian Behlendorf
|
ef62be85bc
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:35:31 -08:00 |
|
Brian Behlendorf
|
1b0348e335
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 11:35:29 -08:00 |
|
Brian Behlendorf
|
b378fd9892
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:35:21 -08:00 |
|
Brian Behlendorf
|
a9ec92e894
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-11 11:35:19 -08:00 |
|
Brian Behlendorf
|
9e327bf061
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:35:12 -08:00 |
|
Brian Behlendorf
|
ad4364426b
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-11 11:35:10 -08:00 |
|
Brian Behlendorf
|
a79f2c09b6
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-11 11:35:03 -08:00 |
|
Brian Behlendorf
|
c951e5d784
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-11 11:35:01 -08:00 |