Brian Behlendorf
|
2ba46cd48c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:31:56 -07:00 |
|
Brian Behlendorf
|
ea175483f6
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-06-09 16:31:50 -07:00 |
|
Brian Behlendorf
|
9c2952090d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:31:25 -07:00 |
|
Brian Behlendorf
|
dfc5c402b4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-06-09 16:31:20 -07:00 |
|
Brian Behlendorf
|
6496d1dae2
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:30:59 -07:00 |
|
Brian Behlendorf
|
14f84d58a3
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-06-09 16:30:53 -07:00 |
|
Brian Behlendorf
|
1f02cafed6
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:30:32 -07:00 |
|
Brian Behlendorf
|
62ca1a6613
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-06-09 16:30:27 -07:00 |
|
Brian Behlendorf
|
7b675ba821
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:30:07 -07:00 |
|
Brian Behlendorf
|
83de6db13f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-06-09 16:30:02 -07:00 |
|
Brian Behlendorf
|
4bc277110c
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:29:42 -07:00 |
|
Brian Behlendorf
|
4c61227c5c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-06-09 16:29:35 -07:00 |
|
Brian Behlendorf
|
12d9ffd69e
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:29:15 -07:00 |
|
Brian Behlendorf
|
d3359d6962
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-06-09 16:29:11 -07:00 |
|
Brian Behlendorf
|
40b96b2853
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-06-09 16:29:09 -07:00 |
|
Brian Behlendorf
|
9836378755
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:28:32 -07:00 |
|
Brian Behlendorf
|
194fc90fc6
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-06-09 16:28:28 -07:00 |
|
Brian Behlendorf
|
5dc602d631
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-06-09 16:28:26 -07:00 |
|
Brian Behlendorf
|
4d3c0d3cb6
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:27:50 -07:00 |
|
Brian Behlendorf
|
05b3b0bc1d
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-06-09 16:27:45 -07:00 |
|
Brian Behlendorf
|
19e1af2de2
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:27:25 -07:00 |
|
Brian Behlendorf
|
99682cad91
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-06-09 16:27:20 -07:00 |
|
Brian Behlendorf
|
eff6a93274
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:26:59 -07:00 |
|
Brian Behlendorf
|
0c3b01ea1b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-06-09 16:26:54 -07:00 |
|
Brian Behlendorf
|
ff3fff8a47
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:26:34 -07:00 |
|
Brian Behlendorf
|
fa768b6a65
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-06-09 16:26:30 -07:00 |
|
Brian Behlendorf
|
149d9f77be
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:26:10 -07:00 |
|
Brian Behlendorf
|
5956cd1a7b
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-06-09 16:26:05 -07:00 |
|
Brian Behlendorf
|
958741a434
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:25:46 -07:00 |
|
Brian Behlendorf
|
ee80bba232
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-06-09 16:25:41 -07:00 |
|
Brian Behlendorf
|
e163e7ca11
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:25:21 -07:00 |
|
Brian Behlendorf
|
e691804509
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-06-09 16:25:17 -07:00 |
|
Brian Behlendorf
|
0f1012be0a
|
Add basic zlib autoconf check for user space build.
|
2009-06-09 16:09:17 -07:00 |
|
Brian Behlendorf
|
9aac634ded
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-06-09 14:48:29 -07:00 |
|
Brian Behlendorf
|
efdde41aae
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-06-09 14:48:25 -07:00 |
|
Brian Behlendorf
|
9a0c2aaeb7
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-06-09 14:47:59 -07:00 |
|
Brian Behlendorf
|
59fbe8b68a
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-06-09 14:47:55 -07:00 |
|
Brian Behlendorf
|
fd0636c2d9
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-06-09 14:47:34 -07:00 |
|
Brian Behlendorf
|
3651aae0b3
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-06-09 14:47:30 -07:00 |
|
Brian Behlendorf
|
00eefe61f0
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-06-09 14:47:10 -07:00 |
|
Brian Behlendorf
|
4fd81a15cc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-06-09 14:47:06 -07:00 |
|
Brian Behlendorf
|
8d9fe3f317
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-06-09 14:46:45 -07:00 |
|
Brian Behlendorf
|
580ec24fa5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-06-09 14:46:41 -07:00 |
|
Brian Behlendorf
|
8b3ab57705
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-06-09 14:46:20 -07:00 |
|
Brian Behlendorf
|
8aea508e76
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-06-09 14:46:15 -07:00 |
|
Brian Behlendorf
|
4fdcd3469f
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-06-09 14:45:55 -07:00 |
|
Brian Behlendorf
|
19d8b69b7b
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-06-09 14:45:50 -07:00 |
|
Brian Behlendorf
|
f283ebee04
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-06-09 14:45:28 -07:00 |
|
Brian Behlendorf
|
688bb363bf
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-06-09 14:45:23 -07:00 |
|
Brian Behlendorf
|
bb9c2450f5
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-06-09 14:45:03 -07:00 |