Brian Behlendorf
|
8a26aba80a
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:27 -08:00 |
|
Brian Behlendorf
|
e8815843b4
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:53:25 -08:00 |
|
Brian Behlendorf
|
aac7460755
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:21 -08:00 |
|
Brian Behlendorf
|
41aaf052de
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:53:19 -08:00 |
|
Brian Behlendorf
|
6081e8c4de
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:15 -08:00 |
|
Brian Behlendorf
|
4b7319cd19
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 13:53:14 -08:00 |
|
Brian Behlendorf
|
747538ef62
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:10 -08:00 |
|
Brian Behlendorf
|
f4f6b1f529
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:53:09 -08:00 |
|
Brian Behlendorf
|
ecb1da0ac8
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:53:08 -08:00 |
|
Brian Behlendorf
|
dcad202470
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:02 -08:00 |
|
Brian Behlendorf
|
1bf7e13e78
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:53:00 -08:00 |
|
Brian Behlendorf
|
ef0739a21d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:52:59 -08:00 |
|
Brian Behlendorf
|
7ff069837e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:52:54 -08:00 |
|
Brian Behlendorf
|
2724501c9c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-18 13:52:52 -08:00 |
|
Brian Behlendorf
|
478a2d1058
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:52:48 -08:00 |
|
Brian Behlendorf
|
66b90a2ffc
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-18 13:52:46 -08:00 |
|
Brian Behlendorf
|
1679df3bf3
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:52:43 -08:00 |
|
Brian Behlendorf
|
303f50212a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-18 13:52:41 -08:00 |
|
Brian Behlendorf
|
719b3735a8
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:52:38 -08:00 |
|
Brian Behlendorf
|
59f5c32acd
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-18 13:52:35 -08:00 |
|
Brian Behlendorf
|
dba05eec8c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:52:32 -08:00 |
|
Brian Behlendorf
|
f7acab2b42
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 13:52:30 -08:00 |
|
Brian Behlendorf
|
9c8b1238a2
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:52:27 -08:00 |
|
Brian Behlendorf
|
a195bca5d9
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-18 13:52:25 -08:00 |
|
Brian Behlendorf
|
22a4ca8484
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:52:21 -08:00 |
|
Brian Behlendorf
|
5a52b2f7ce
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-18 13:52:18 -08:00 |
|
Brian Behlendorf
|
433b5c8023
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:52:17 -08:00 |
|
Brian Behlendorf
|
93bc33a39e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:52:16 -08:00 |
|
Brian Behlendorf
|
532525be3a
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-18 13:52:16 -08:00 |
|
Brian Behlendorf
|
23e30eeec9
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:52:15 -08:00 |
|
Brian Behlendorf
|
6cccf01d35
|
Missed needed drc var
|
2008-12-18 13:50:12 -08:00 |
|
Brian Behlendorf
|
a4b20ba6f5
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:45:03 -08:00 |
|
Brian Behlendorf
|
e4fed57b6b
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-18 13:45:01 -08:00 |
|
Brian Behlendorf
|
720a8e085f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:58 -08:00 |
|
Brian Behlendorf
|
60288426d0
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 13:44:56 -08:00 |
|
Brian Behlendorf
|
476c1eaff6
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:53 -08:00 |
|
Brian Behlendorf
|
2f10910f57
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:44:51 -08:00 |
|
Brian Behlendorf
|
c92704f9cd
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:48 -08:00 |
|
Brian Behlendorf
|
f10efffce5
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 13:44:46 -08:00 |
|
Brian Behlendorf
|
d4401cbf12
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:43 -08:00 |
|
Brian Behlendorf
|
283fb597f1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-18 13:44:41 -08:00 |
|
Brian Behlendorf
|
ea608c5dad
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:38 -08:00 |
|
Brian Behlendorf
|
38f780909b
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-18 13:44:36 -08:00 |
|
Brian Behlendorf
|
8b4937ced9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:33 -08:00 |
|
Brian Behlendorf
|
72d21b338c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 13:44:31 -08:00 |
|
Brian Behlendorf
|
e7c038d635
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:28 -08:00 |
|
Brian Behlendorf
|
5200db236f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:44:26 -08:00 |
|
Brian Behlendorf
|
08d51f49e7
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:23 -08:00 |
|
Brian Behlendorf
|
c20b05ba8f
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:44:21 -08:00 |
|
Brian Behlendorf
|
2e7ba8c88a
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:44:18 -08:00 |