Brian Behlendorf
|
8ad629750e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-13 13:32:30 -08:00 |
|
Brian Behlendorf
|
16c26fa9cd
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-13 13:32:30 -08:00 |
|
Brian Behlendorf
|
bb9b10a830
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-13 13:32:29 -08:00 |
|
Brian Behlendorf
|
b73b29ab8e
|
Fix c90 issue with { }
|
2009-01-13 13:30:35 -08:00 |
|
Brian Behlendorf
|
86321d103e
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-13 12:32:38 -08:00 |
|
Brian Behlendorf
|
1e284d7496
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-13 12:32:35 -08:00 |
|
Brian Behlendorf
|
053d878c2e
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-13 12:32:33 -08:00 |
|
Brian Behlendorf
|
08bc5aa405
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 12:32:30 -08:00 |
|
Brian Behlendorf
|
18a875854b
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-13 12:32:23 -08:00 |
|
Brian Behlendorf
|
1481a4a7df
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 12:32:19 -08:00 |
|
Brian Behlendorf
|
d07009d2f7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 12:32:18 -08:00 |
|
Brian Behlendorf
|
a0f86c6571
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 12:32:07 -08:00 |
|
Brian Behlendorf
|
6c2e910597
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 12:32:03 -08:00 |
|
Brian Behlendorf
|
5a36a4b40b
|
Pull in needed hunk from old patch stack for a ZFS build without the ZPL support
|
2009-01-13 12:28:26 -08:00 |
|
Brian Behlendorf
|
4ab6c5a787
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-13 11:58:07 -08:00 |
|
Brian Behlendorf
|
166f7ae98d
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-13 11:58:06 -08:00 |
|
Brian Behlendorf
|
8504464870
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:58:05 -08:00 |
|
Brian Behlendorf
|
4f5afce41d
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-13 11:58:03 -08:00 |
|
Brian Behlendorf
|
418e6bc8ad
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:58:00 -08:00 |
|
Brian Behlendorf
|
a69842074f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-13 11:57:59 -08:00 |
|
Brian Behlendorf
|
aa13269f5f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:56 -08:00 |
|
Brian Behlendorf
|
d936b9a966
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-13 11:57:54 -08:00 |
|
Brian Behlendorf
|
8490c732af
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:51 -08:00 |
|
Brian Behlendorf
|
b8761b72ba
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 11:57:49 -08:00 |
|
Brian Behlendorf
|
957d984c7a
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:46 -08:00 |
|
Brian Behlendorf
|
ae7c13bdf1
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-13 11:57:45 -08:00 |
|
Brian Behlendorf
|
7f4f3039f8
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:42 -08:00 |
|
Brian Behlendorf
|
839a421452
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-13 11:57:40 -08:00 |
|
Brian Behlendorf
|
f69793c299
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:37 -08:00 |
|
Brian Behlendorf
|
679b739731
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-13 11:57:35 -08:00 |
|
Brian Behlendorf
|
fbf9859f4d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:32 -08:00 |
|
Brian Behlendorf
|
35a3d014c5
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 11:57:31 -08:00 |
|
Brian Behlendorf
|
65f0a3dbaa
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:28 -08:00 |
|
Brian Behlendorf
|
365948cb36
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 11:57:26 -08:00 |
|
Brian Behlendorf
|
71a8872efb
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:23 -08:00 |
|
Brian Behlendorf
|
a2c46bae3f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 11:57:22 -08:00 |
|
Brian Behlendorf
|
8f4ae7a03d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:18 -08:00 |
|
Brian Behlendorf
|
db4ac6a25f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 11:57:17 -08:00 |
|
Brian Behlendorf
|
407284e688
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:14 -08:00 |
|
Brian Behlendorf
|
b40ad58927
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 11:57:13 -08:00 |
|
Brian Behlendorf
|
fafbdf448a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 11:57:12 -08:00 |
|
Brian Behlendorf
|
4a5b46ab97
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:57:07 -08:00 |
|
Brian Behlendorf
|
16e1bda84b
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 11:57:05 -08:00 |
|
Brian Behlendorf
|
04a87f57ca
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 11:57:05 -08:00 |
|
Brian Behlendorf
|
bccc79b2c9
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:59 -08:00 |
|
Brian Behlendorf
|
306d0df7bf
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-13 11:56:57 -08:00 |
|
Brian Behlendorf
|
f5ad4208db
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:54 -08:00 |
|
Brian Behlendorf
|
61a8396893
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-13 11:56:53 -08:00 |
|
Brian Behlendorf
|
331445ab72
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:56:50 -08:00 |
|
Brian Behlendorf
|
daa7e47c22
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-13 11:56:48 -08:00 |