Brian Behlendorf
|
ae8ad306a4
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:45:09 -08:00 |
|
Brian Behlendorf
|
266ab8c268
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 10:45:08 -08:00 |
|
Brian Behlendorf
|
1122c7fc76
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:45:04 -08:00 |
|
Brian Behlendorf
|
6f0a0f1f5f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 10:45:03 -08:00 |
|
Brian Behlendorf
|
91160f4b32
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:45:00 -08:00 |
|
Brian Behlendorf
|
c0e97ee28d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 10:44:59 -08:00 |
|
Brian Behlendorf
|
c2e05646d1
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:57 -08:00 |
|
Brian Behlendorf
|
ad8923316f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:44:56 -08:00 |
|
Brian Behlendorf
|
d26d53fafc
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:44:55 -08:00 |
|
Brian Behlendorf
|
2e109b9873
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:50 -08:00 |
|
Brian Behlendorf
|
42d72a45fa
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 10:44:49 -08:00 |
|
Brian Behlendorf
|
3b0ebda451
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:44:49 -08:00 |
|
Brian Behlendorf
|
8fbdf06a0d
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:44 -08:00 |
|
Brian Behlendorf
|
9d5e714ca4
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 10:44:43 -08:00 |
|
Brian Behlendorf
|
9ab5cbd2ea
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:40 -08:00 |
|
Brian Behlendorf
|
2ee07bf418
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 10:44:39 -08:00 |
|
Brian Behlendorf
|
a75bb3b9a9
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:36 -08:00 |
|
Brian Behlendorf
|
760b2a3f0f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 10:44:35 -08:00 |
|
Brian Behlendorf
|
7a6b045ce5
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:32 -08:00 |
|
Brian Behlendorf
|
83b3367ab1
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 10:44:31 -08:00 |
|
Brian Behlendorf
|
e02f76135d
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:28 -08:00 |
|
Brian Behlendorf
|
83a665a1ae
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 10:44:27 -08:00 |
|
Brian Behlendorf
|
4144090ec0
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:24 -08:00 |
|
Brian Behlendorf
|
0051815cb6
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 10:44:23 -08:00 |
|
Brian Behlendorf
|
8aff6b7eec
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:20 -08:00 |
|
Brian Behlendorf
|
4b7781b965
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 10:44:19 -08:00 |
|
Brian Behlendorf
|
d7ec1ed532
|
Refine Makefiles
|
2008-12-12 10:43:39 -08:00 |
|
Brian Behlendorf
|
4bfe79e064
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:52 -08:00 |
|
Brian Behlendorf
|
6d0d603ee1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:38:51 -08:00 |
|
Brian Behlendorf
|
dcd3877793
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:48 -08:00 |
|
Brian Behlendorf
|
8210c5d4f7
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 10:38:47 -08:00 |
|
Brian Behlendorf
|
f1ad9710e4
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:44 -08:00 |
|
Brian Behlendorf
|
9a30c4847f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 10:38:43 -08:00 |
|
Brian Behlendorf
|
059229f8eb
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:40 -08:00 |
|
Brian Behlendorf
|
a77d8e31b3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 10:38:39 -08:00 |
|
Brian Behlendorf
|
6d1511fb27
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:36 -08:00 |
|
Brian Behlendorf
|
3ce4c0c0a2
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 10:38:35 -08:00 |
|
Brian Behlendorf
|
387f88e5f0
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:31 -08:00 |
|
Brian Behlendorf
|
d60f962547
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 10:38:30 -08:00 |
|
Brian Behlendorf
|
91b38929e3
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:27 -08:00 |
|
Brian Behlendorf
|
298c3e1736
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 10:38:26 -08:00 |
|
Brian Behlendorf
|
b0b2265e79
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:24 -08:00 |
|
Brian Behlendorf
|
92afe68367
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 10:38:23 -08:00 |
|
Brian Behlendorf
|
86d63784a5
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:20 -08:00 |
|
Brian Behlendorf
|
5b7cbb0234
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 10:38:19 -08:00 |
|
Brian Behlendorf
|
be2f87acea
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:16 -08:00 |
|
Brian Behlendorf
|
d7ac648d3e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 10:38:15 -08:00 |
|
Brian Behlendorf
|
675e853f48
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:38:12 -08:00 |
|
Brian Behlendorf
|
07f84cad28
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:38:11 -08:00 |
|
Brian Behlendorf
|
1cce2945a5
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:38:10 -08:00 |