Brian Behlendorf
|
33ee5a1dbe
|
Resolve conflict
|
2008-12-11 14:06:30 -08:00 |
|
Brian Behlendorf
|
6be693786a
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:05:45 -08:00 |
|
Brian Behlendorf
|
8ca859a47b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 14:05:44 -08:00 |
|
Brian Behlendorf
|
53215c950e
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:05:40 -08:00 |
|
Brian Behlendorf
|
a83549fbf3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 14:05:38 -08:00 |
|
Brian Behlendorf
|
cf9208af88
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:05:35 -08:00 |
|
Brian Behlendorf
|
676bd83f6d
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-11 14:05:33 -08:00 |
|
Brian Behlendorf
|
fd3e7827d9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:05:30 -08:00 |
|
Brian Behlendorf
|
4ee70f1453
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 14:05:28 -08:00 |
|
Brian Behlendorf
|
d54a548cf3
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:05:25 -08:00 |
|
Brian Behlendorf
|
28cf0b0674
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-11 14:05:23 -08:00 |
|
Brian Behlendorf
|
1594cf4330
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:05:20 -08:00 |
|
Brian Behlendorf
|
31927647a8
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 14:05:18 -08:00 |
|
Brian Behlendorf
|
61d801df84
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:05:14 -08:00 |
|
Brian Behlendorf
|
b9c746ed0b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 14:05:13 -08:00 |
|
Brian Behlendorf
|
c5986d4587
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:05:09 -08:00 |
|
Brian Behlendorf
|
fdff27558a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 14:05:08 -08:00 |
|
Brian Behlendorf
|
af91f6fc16
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:05:04 -08:00 |
|
Brian Behlendorf
|
76678238e3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 14:05:03 -08:00 |
|
Brian Behlendorf
|
dfc7c1463a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 14:05:02 -08:00 |
|
Brian Behlendorf
|
b028f4d00e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:04:56 -08:00 |
|
Brian Behlendorf
|
13dd117d28
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 14:04:55 -08:00 |
|
Brian Behlendorf
|
94e1055395
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:04:54 -08:00 |
|
Brian Behlendorf
|
e83833544f
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:04:48 -08:00 |
|
Brian Behlendorf
|
4d8fd75005
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 14:04:46 -08:00 |
|
Brian Behlendorf
|
fd66441f5f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:04:43 -08:00 |
|
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 |