Brian Behlendorf
|
2fbcf94bce
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-10-09 16:08:24 -07:00 |
|
Brian Behlendorf
|
8cafc7c6da
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:08:19 -07:00 |
|
Brian Behlendorf
|
1bee1a4dda
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-10-09 16:08:17 -07:00 |
|
Brian Behlendorf
|
a740d2a8f7
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:
lib/Makefile.am
|
2009-10-09 16:06:51 -07:00 |
|
Brian Behlendorf
|
aed86aa54e
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-10-09 16:03:08 -07:00 |
|
Brian Behlendorf
|
a0337cfcd8
|
Add libefi library in to the build system.
|
2009-10-09 15:58:45 -07:00 |
|
Brian Behlendorf
|
67fc15510b
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:46:13 -07:00 |
|
Brian Behlendorf
|
89f2bafc9c
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-10-09 15:46:11 -07:00 |
|
Brian Behlendorf
|
87c581072f
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:46:05 -07:00 |
|
Brian Behlendorf
|
5507884803
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-10-09 15:46:03 -07:00 |
|
Brian Behlendorf
|
f682d5a349
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:45:57 -07:00 |
|
Brian Behlendorf
|
c3b45fe669
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-10-09 15:45:55 -07:00 |
|
Brian Behlendorf
|
8e3f966358
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:45:49 -07:00 |
|
Brian Behlendorf
|
a4665e8ed8
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-10-09 15:45:46 -07:00 |
|
Brian Behlendorf
|
d2d72c560d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:45:40 -07:00 |
|
Brian Behlendorf
|
746882c100
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-10-09 15:45:38 -07:00 |
|
Brian Behlendorf
|
60a435ec49
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:45:31 -07:00 |
|
Brian Behlendorf
|
cd82cb1836
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-10-09 15:45:30 -07:00 |
|
Brian Behlendorf
|
d34a8d0320
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:45:23 -07:00 |
|
Brian Behlendorf
|
503c5eeb2d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-10-09 15:45:22 -07:00 |
|
Brian Behlendorf
|
a2f22b1880
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:45:16 -07:00 |
|
Brian Behlendorf
|
a2c9b6108b
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-10-09 15:45:14 -07:00 |
|
Brian Behlendorf
|
d8d5fd89f4
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:45:08 -07:00 |
|
Brian Behlendorf
|
9a76c49ee6
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-10-09 15:45:06 -07:00 |
|
Brian Behlendorf
|
ecd487d914
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:45:00 -07:00 |
|
Brian Behlendorf
|
6e242e97ab
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-10-09 15:44:58 -07:00 |
|
Brian Behlendorf
|
9cb5db7a2e
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:44:52 -07:00 |
|
Brian Behlendorf
|
dca2a45b68
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-10-09 15:44:50 -07:00 |
|
Brian Behlendorf
|
8148ec8ab6
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:44:44 -07:00 |
|
Brian Behlendorf
|
1e8929d87f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-10-09 15:44:42 -07:00 |
|
Brian Behlendorf
|
820ce5e597
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:44:36 -07:00 |
|
Brian Behlendorf
|
6f1f464617
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-10-09 15:44:34 -07:00 |
|
Brian Behlendorf
|
f4f3b6d8a4
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-10-09 15:44:33 -07:00 |
|
Brian Behlendorf
|
880c6fdb40
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:44:22 -07:00 |
|
Brian Behlendorf
|
84c609e202
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-10-09 15:44:20 -07:00 |
|
Brian Behlendorf
|
699f996fde
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-10-09 15:44:19 -07:00 |
|
Brian Behlendorf
|
9bf13e630d
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:44:08 -07:00 |
|
Brian Behlendorf
|
70bda9e7c2
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-10-09 15:44:06 -07:00 |
|
Brian Behlendorf
|
977eee3b27
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:44:00 -07:00 |
|
Brian Behlendorf
|
5ae21ec0c5
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-10-09 15:43:59 -07:00 |
|
Brian Behlendorf
|
f29707b6c0
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:43:53 -07:00 |
|
Brian Behlendorf
|
f640737181
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-10-09 15:43:51 -07:00 |
|
Brian Behlendorf
|
c09ba15413
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:43:44 -07:00 |
|
Brian Behlendorf
|
f13b814a9c
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-10-09 15:43:42 -07:00 |
|
Brian Behlendorf
|
90b0761a16
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-10-09 15:43:37 -07:00 |
|
Brian Behlendorf
|
121fd40b33
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-10-09 15:43:34 -07:00 |
|
Brian Behlendorf
|
e0e0f0ea84
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-10-09 15:43:33 -07:00 |
|
Brian Behlendorf
|
2b2fd27e18
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-10-09 15:43:32 -07:00 |
|
Brian Behlendorf
|
ad0f8481d2
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-10-09 15:43:31 -07:00 |
|
Brian Behlendorf
|
b60766e22f
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-10-09 15:43:31 -07:00 |