Brian Behlendorf
|
7edc6e24a8
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 13:52:42 -08:00 |
|
Brian Behlendorf
|
55f14f55b6
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:52:38 -08:00 |
|
Brian Behlendorf
|
171df20083
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 13:52:37 -08:00 |
|
Brian Behlendorf
|
4944a74c80
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:52:33 -08:00 |
|
Brian Behlendorf
|
9bf58af1f5
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 13:52:31 -08:00 |
|
Brian Behlendorf
|
d97f261bd6
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:52:28 -08:00 |
|
Brian Behlendorf
|
6157e981b3
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 13:52:26 -08:00 |
|
Brian Behlendorf
|
0d1b8a2b8e
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:52:23 -08:00 |
|
Brian Behlendorf
|
ddb72e5a3d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 13:52:21 -08:00 |
|
Brian Behlendorf
|
54f56e392d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:52:18 -08:00 |
|
Brian Behlendorf
|
262e367cd5
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 13:52:16 -08:00 |
|
Brian Behlendorf
|
2e7335c2b1
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:52:12 -08:00 |
|
Brian Behlendorf
|
877699acb1
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 13:52:11 -08:00 |
|
Brian Behlendorf
|
9d635b47d0
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:52:07 -08:00 |
|
Brian Behlendorf
|
8f69262e09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:52:06 -08:00 |
|
Brian Behlendorf
|
c93aec7f64
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:52:05 -08:00 |
|
Brian Behlendorf
|
acb4d7f272
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:59 -08:00 |
|
Brian Behlendorf
|
ca2b6db925
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 13:51:58 -08:00 |
|
Brian Behlendorf
|
1f72057409
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 13:51:57 -08:00 |
|
Brian Behlendorf
|
f78bab9e59
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:51 -08:00 |
|
Brian Behlendorf
|
a9eca80e53
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 13:51:49 -08:00 |
|
Brian Behlendorf
|
70ee32441a
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:46 -08:00 |
|
Brian Behlendorf
|
1c2cf3a788
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 13:51:45 -08:00 |
|
Brian Behlendorf
|
b06f613c93
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:41 -08:00 |
|
Brian Behlendorf
|
52bfcda357
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 13:51:39 -08:00 |
|
Brian Behlendorf
|
49a2f9853d
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:36 -08:00 |
|
Brian Behlendorf
|
2de884be21
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 13:51:34 -08:00 |
|
Brian Behlendorf
|
85b285ac4a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:31 -08:00 |
|
Brian Behlendorf
|
3348038cc6
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 13:51:29 -08:00 |
|
Brian Behlendorf
|
9e8154494a
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:26 -08:00 |
|
Brian Behlendorf
|
9cc0b468ff
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 13:51:24 -08:00 |
|
Brian Behlendorf
|
05fafc638f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:21 -08:00 |
|
Brian Behlendorf
|
4251330f28
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 13:51:18 -08:00 |
|
Brian Behlendorf
|
90e5216ea9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 13:51:17 -08:00 |
|
Brian Behlendorf
|
c7c77e1279
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 13:51:16 -08:00 |
|
Brian Behlendorf
|
035e4d373e
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 13:51:16 -08:00 |
|
Brian Behlendorf
|
c9597f9a4f
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 13:51:15 -08:00 |
|
Brian Behlendorf
|
3b93dc4d82
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 13:51:14 -08:00 |
|
Brian Behlendorf
|
c9357d8ef2
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 13:51:13 -08:00 |
|
Brian Behlendorf
|
3a953fa870
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-22 13:51:13 -08:00 |
|
Brian Behlendorf
|
d684390d3a
|
Just fix a bogus return type
|
2008-12-22 13:49:15 -08:00 |
|
Brian Behlendorf
|
6bed331e59
|
More compat changes
|
2008-12-22 13:47:58 -08:00 |
|
Brian Behlendorf
|
f41626ced6
|
Make ZPL conditional
|
2008-12-22 13:46:30 -08:00 |
|
Brian Behlendorf
|
9d731b801b
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:15 -08:00 |
|
Brian Behlendorf
|
f046fb3552
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:14 -08:00 |
|
Brian Behlendorf
|
e9def5f6ab
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:13 -08:00 |
|
Brian Behlendorf
|
3f5f22eab0
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 13:35:12 -08:00 |
|
Brian Behlendorf
|
72192de531
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:09 -08:00 |
|
Brian Behlendorf
|
a9058c38b3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:35:07 -08:00 |
|
Brian Behlendorf
|
9bfe4e627a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:35:06 -08:00 |