Brian Behlendorf
|
99676a4f16
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:59:50 -08:00 |
|
Brian Behlendorf
|
996531ac45
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-18 13:59:48 -08:00 |
|
Brian Behlendorf
|
cbd2875a13
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:59:44 -08:00 |
|
Brian Behlendorf
|
5dfeeb9cf8
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-18 13:59:42 -08:00 |
|
Brian Behlendorf
|
aeeb03ed67
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:59:38 -08:00 |
|
Brian Behlendorf
|
ed1250e28c
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 13:59:36 -08:00 |
|
Brian Behlendorf
|
fa115c38ab
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:59:32 -08:00 |
|
Brian Behlendorf
|
ec81cd90b5
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-18 13:59:30 -08:00 |
|
Brian Behlendorf
|
14f2199c22
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:59:27 -08:00 |
|
Brian Behlendorf
|
4f9b2c18ef
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-18 13:59:24 -08:00 |
|
Brian Behlendorf
|
fa020b0f7e
|
Remove -Wshadow for now
|
2008-12-18 13:57:27 -08:00 |
|
Brian Behlendorf
|
899ac070d5
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:54:09 -08:00 |
|
Brian Behlendorf
|
81cd7bb991
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-18 13:54:08 -08:00 |
|
Brian Behlendorf
|
859c9215ee
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:54:04 -08:00 |
|
Brian Behlendorf
|
c88c58784c
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 13:54:03 -08:00 |
|
Brian Behlendorf
|
b76f854993
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:59 -08:00 |
|
Brian Behlendorf
|
0a9ad44fff
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:53:57 -08:00 |
|
Brian Behlendorf
|
349ec1aafb
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:53 -08:00 |
|
Brian Behlendorf
|
d3f9ffdcd7
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 13:53:51 -08:00 |
|
Brian Behlendorf
|
cf57d3e0c9
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:48 -08:00 |
|
Brian Behlendorf
|
ba3144a196
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-18 13:53:46 -08:00 |
|
Brian Behlendorf
|
d24558aeed
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:43 -08:00 |
|
Brian Behlendorf
|
cc3579f66a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-18 13:53:41 -08:00 |
|
Brian Behlendorf
|
f1b7b8b7a8
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:37 -08:00 |
|
Brian Behlendorf
|
5b77a97eff
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 13:53:35 -08:00 |
|
Brian Behlendorf
|
7661ab250a
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:53:32 -08:00 |
|
Brian Behlendorf
|
63f8023d96
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:53:30 -08:00 |
|
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 |