Brian Behlendorf
|
b9d4d3aa43
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:10 -08:00 |
|
Brian Behlendorf
|
8e5dafd100
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 13:58:08 -08:00 |
|
Brian Behlendorf
|
5ca665138f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:05 -08:00 |
|
Brian Behlendorf
|
0357eb64a4
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-09 13:58:04 -08:00 |
|
Brian Behlendorf
|
b8c51a5c7a
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:58:01 -08:00 |
|
Brian Behlendorf
|
9ab4dcc133
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-09 13:58:00 -08:00 |
|
Brian Behlendorf
|
5262103dbc
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:57:56 -08:00 |
|
Brian Behlendorf
|
8acd1663f9
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 13:57:55 -08:00 |
|
Brian Behlendorf
|
0d0e1d4e69
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:57:52 -08:00 |
|
Brian Behlendorf
|
71d1b9bbf9
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-09 13:57:51 -08:00 |
|
Brian Behlendorf
|
8d7bb9eb49
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:57:47 -08:00 |
|
Brian Behlendorf
|
bdac8f1a37
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-09 13:57:46 -08:00 |
|
Brian Behlendorf
|
e22d4754cc
|
Build system cleanup
|
2008-12-09 13:51:31 -08:00 |
|
Brian Behlendorf
|
4467d0336a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-09 13:48:46 -08:00 |
|
Brian Behlendorf
|
1654a48217
|
Build system update
|
2008-12-09 13:46:53 -08:00 |
|
Brian Behlendorf
|
5f4002a6ed
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:43:51 -08:00 |
|
Brian Behlendorf
|
64142ad47c
|
Resolve conflict
|
2008-12-09 13:43:46 -08:00 |
|
Brian Behlendorf
|
88d679f5de
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:43:28 -08:00 |
|
Brian Behlendorf
|
7af9bd9d90
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-09 13:43:27 -08:00 |
|
Brian Behlendorf
|
1eb4c7b0b4
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:43:23 -08:00 |
|
Brian Behlendorf
|
fa5b071b11
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-09 13:43:22 -08:00 |
|
Brian Behlendorf
|
135e379a24
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:43:19 -08:00 |
|
Brian Behlendorf
|
4647a783e2
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-09 13:43:17 -08:00 |
|
Brian Behlendorf
|
9bea4dd47c
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:43:14 -08:00 |
|
Brian Behlendorf
|
edff35e0ea
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-09 13:43:13 -08:00 |
|
Brian Behlendorf
|
e631d4fce3
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:43:10 -08:00 |
|
Brian Behlendorf
|
b8f71d0b33
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-09 13:43:09 -08:00 |
|
Brian Behlendorf
|
4503c51efa
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:43:05 -08:00 |
|
Brian Behlendorf
|
820c397107
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-09 13:43:04 -08:00 |
|
Brian Behlendorf
|
c25cb0bbb0
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:43:01 -08:00 |
|
Brian Behlendorf
|
dbf081be6f
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-09 13:43:00 -08:00 |
|
Brian Behlendorf
|
57a42d14fe
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:42:56 -08:00 |
|
Brian Behlendorf
|
a93e757412
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-09 13:42:55 -08:00 |
|
Brian Behlendorf
|
871647aa29
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:42:52 -08:00 |
|
Brian Behlendorf
|
087c28332b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-09 13:42:51 -08:00 |
|
Brian Behlendorf
|
7efdfe43d4
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:42:47 -08:00 |
|
Brian Behlendorf
|
cae724a895
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 13:42:46 -08:00 |
|
Brian Behlendorf
|
73fdb26fde
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 13:42:45 -08:00 |
|
Brian Behlendorf
|
b256d88ef3
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:42:40 -08:00 |
|
Brian Behlendorf
|
34b87c9de5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-09 13:42:39 -08:00 |
|
Brian Behlendorf
|
1bc99e3fa0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 13:42:38 -08:00 |
|
Brian Behlendorf
|
780d231e12
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:42:32 -08:00 |
|
Brian Behlendorf
|
4c65dc7197
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 13:42:31 -08:00 |
|
Brian Behlendorf
|
2d9651fc82
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:42:28 -08:00 |
|
Brian Behlendorf
|
d171320efc
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-09 13:42:27 -08:00 |
|
Brian Behlendorf
|
84aa526170
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:42:23 -08:00 |
|
Brian Behlendorf
|
52329e0fa5
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-09 13:42:22 -08:00 |
|
Brian Behlendorf
|
9ff3ce4d29
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:42:19 -08:00 |
|
Brian Behlendorf
|
1145019bf9
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 13:42:18 -08:00 |
|
Brian Behlendorf
|
97b2ff580e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-09 13:42:14 -08:00 |