Brian Behlendorf
|
c72031947c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:04:38 -08:00 |
|
Brian Behlendorf
|
5b40e56c3a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-20 17:04:35 -08:00 |
|
Brian Behlendorf
|
907be3c4fa
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:04:28 -08:00 |
|
Brian Behlendorf
|
631c01fdc7
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-20 17:04:25 -08:00 |
|
Brian Behlendorf
|
4aed5c3c27
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:04:19 -08:00 |
|
Brian Behlendorf
|
e87b476e37
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-20 17:04:16 -08:00 |
|
Brian Behlendorf
|
f80a4e8896
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:04:09 -08:00 |
|
Brian Behlendorf
|
4df8d3f09b
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-20 17:04:05 -08:00 |
|
Brian Behlendorf
|
7181083b97
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:03:58 -08:00 |
|
Brian Behlendorf
|
cd7a847a52
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-20 17:03:55 -08:00 |
|
Brian Behlendorf
|
e39e3509c0
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:03:49 -08:00 |
|
Brian Behlendorf
|
f51d6ef8e3
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-20 17:03:46 -08:00 |
|
Brian Behlendorf
|
7cee5150ba
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:03:40 -08:00 |
|
Brian Behlendorf
|
f2a40ac2d3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-20 17:03:37 -08:00 |
|
Brian Behlendorf
|
a9eb11f125
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-20 17:03:35 -08:00 |
|
Brian Behlendorf
|
2c52c9bbc8
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:03:24 -08:00 |
|
Brian Behlendorf
|
1b1d25473f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-20 17:03:21 -08:00 |
|
Brian Behlendorf
|
287257c817
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 17:03:19 -08:00 |
|
Brian Behlendorf
|
4b9801651e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:03:07 -08:00 |
|
Brian Behlendorf
|
8406f72b48
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-20 17:03:04 -08:00 |
|
Brian Behlendorf
|
e1eb46dd94
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:02:57 -08:00 |
|
Brian Behlendorf
|
2925273b4e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-20 17:02:54 -08:00 |
|
Brian Behlendorf
|
4118243220
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:02:46 -08:00 |
|
Brian Behlendorf
|
3fd85e8acf
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-20 17:02:42 -08:00 |
|
Brian Behlendorf
|
f4b0a26b48
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:02:35 -08:00 |
|
Brian Behlendorf
|
6e36e485ab
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-20 17:02:31 -08:00 |
|
Brian Behlendorf
|
0c304c41d1
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:02:24 -08:00 |
|
Brian Behlendorf
|
eb1857c3b6
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-20 17:02:20 -08:00 |
|
Brian Behlendorf
|
a9570d6149
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:02:13 -08:00 |
|
Brian Behlendorf
|
c04787d23d
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-20 17:02:11 -08:00 |
|
Brian Behlendorf
|
cebdbdf440
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-20 17:02:03 -08:00 |
|
Brian Behlendorf
|
bff435ea95
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-20 17:01:59 -08:00 |
|
Brian Behlendorf
|
40c5baafa2
|
Add file based config, and update the lo config to use real loopback devices, interestingly this currently fails
|
2009-01-20 16:57:45 -08:00 |
|
Brian Behlendorf
|
3a7e1d6fe4
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:25:23 -08:00 |
|
Brian Behlendorf
|
9fea8a6051
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-20 16:25:19 -08:00 |
|
Brian Behlendorf
|
543bac622a
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:25:12 -08:00 |
|
Brian Behlendorf
|
f9cb7c3825
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-20 16:25:09 -08:00 |
|
Brian Behlendorf
|
3fc130e608
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:25:04 -08:00 |
|
Brian Behlendorf
|
849491631f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-20 16:25:01 -08:00 |
|
Brian Behlendorf
|
a7b7dbbb5b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:54 -08:00 |
|
Brian Behlendorf
|
f18ae8b28a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-20 16:24:50 -08:00 |
|
Brian Behlendorf
|
1932827bdb
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:43 -08:00 |
|
Brian Behlendorf
|
5102724fc1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-20 16:24:39 -08:00 |
|
Brian Behlendorf
|
4b8db9524f
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:31 -08:00 |
|
Brian Behlendorf
|
44a8ea0bc9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-20 16:24:28 -08:00 |
|
Brian Behlendorf
|
e6d4b97c42
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:21 -08:00 |
|
Brian Behlendorf
|
5364ceb804
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-20 16:24:17 -08:00 |
|
Brian Behlendorf
|
fa9a9b08a8
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:10 -08:00 |
|
Brian Behlendorf
|
304f0f6d0f
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-20 16:24:08 -08:00 |
|
Brian Behlendorf
|
6f8ec353ee
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-20 16:24:02 -08:00 |