Brian Behlendorf
|
c0abfccb28
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 08:48:49 -08:00 |
|
Brian Behlendorf
|
b74b9388b9
|
Add zfs_config include
|
2008-12-16 08:44:37 -08:00 |
|
Brian Behlendorf
|
0ae73cfa11
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:56:42 -08:00 |
|
Brian Behlendorf
|
f4731393a7
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-15 16:56:39 -08:00 |
|
Brian Behlendorf
|
e6550ccba2
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:56:33 -08:00 |
|
Brian Behlendorf
|
c2f89a5761
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-15 16:56:30 -08:00 |
|
Brian Behlendorf
|
e9f63a7dff
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:56:22 -08:00 |
|
Brian Behlendorf
|
a084b6e645
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-15 16:56:19 -08:00 |
|
Brian Behlendorf
|
e7f91cb188
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:56:11 -08:00 |
|
Brian Behlendorf
|
6b4a70c477
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-15 16:56:07 -08:00 |
|
Brian Behlendorf
|
f6f04cfd87
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:56:00 -08:00 |
|
Brian Behlendorf
|
336c8055c6
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-15 16:55:57 -08:00 |
|
Brian Behlendorf
|
4e0ffb51c2
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:55:49 -08:00 |
|
Brian Behlendorf
|
d2f2f62125
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-15 16:55:46 -08:00 |
|
Brian Behlendorf
|
193d89c038
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:55:39 -08:00 |
|
Brian Behlendorf
|
9443521f90
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-15 16:55:35 -08:00 |
|
Brian Behlendorf
|
ae5a01b59d
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:55:28 -08:00 |
|
Brian Behlendorf
|
58c1b638bf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-15 16:55:24 -08:00 |
|
Brian Behlendorf
|
9c360371c2
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:55:16 -08:00 |
|
Brian Behlendorf
|
c71c97f751
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-15 16:55:12 -08:00 |
|
Brian Behlendorf
|
be13012b93
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:55:05 -08:00 |
|
Brian Behlendorf
|
d33405893f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-15 16:55:01 -08:00 |
|
Brian Behlendorf
|
ea03951fc0
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:54:54 -08:00 |
|
Brian Behlendorf
|
9fa0444ffa
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-15 16:54:51 -08:00 |
|
Brian Behlendorf
|
55d6737a61
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-15 16:54:49 -08:00 |
|
Brian Behlendorf
|
b5dd15fc50
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:54:40 -08:00 |
|
Brian Behlendorf
|
cf3c0c4bdc
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-15 16:54:37 -08:00 |
|
Brian Behlendorf
|
acf0981efc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-15 16:54:36 -08:00 |
|
Brian Behlendorf
|
28a76a7bb2
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:54:24 -08:00 |
|
Brian Behlendorf
|
bac93e9e59
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-15 16:54:20 -08:00 |
|
Brian Behlendorf
|
e73f812fed
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:54:13 -08:00 |
|
Brian Behlendorf
|
325b381298
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-15 16:54:09 -08:00 |
|
Brian Behlendorf
|
be8f47781d
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:54:03 -08:00 |
|
Brian Behlendorf
|
be3d928df8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-15 16:53:59 -08:00 |
|
Brian Behlendorf
|
c3b28ad560
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:53:53 -08:00 |
|
Brian Behlendorf
|
8f1a2e9277
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-15 16:53:45 -08:00 |
|
Brian Behlendorf
|
cee94755c2
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:53:38 -08:00 |
|
Brian Behlendorf
|
9f71257942
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-15 16:53:34 -08:00 |
|
Brian Behlendorf
|
9c2caef557
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:53:27 -08:00 |
|
Brian Behlendorf
|
34a202c55c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-15 16:53:23 -08:00 |
|
Brian Behlendorf
|
de0355b2e7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:53:15 -08:00 |
|
Brian Behlendorf
|
6b95753dd5
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-15 16:53:08 -08:00 |
|
Brian Behlendorf
|
cc420402bf
|
Moving addition configure checks to m4 macros
|
2008-12-15 16:46:34 -08:00 |
|
Brian Behlendorf
|
e639b049ee
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:38:13 -08:00 |
|
Brian Behlendorf
|
afc8e4c314
|
Conflict
|
2008-12-15 16:38:04 -08:00 |
|
Brian Behlendorf
|
1b25a404c5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:37:38 -08:00 |
|
Brian Behlendorf
|
5a8b8a50e6
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-15 16:37:34 -08:00 |
|
Brian Behlendorf
|
e6b20dff7e
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:37:27 -08:00 |
|
Brian Behlendorf
|
741a9921eb
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-15 16:37:23 -08:00 |
|
Brian Behlendorf
|
4076baaddc
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:37:17 -08:00 |