Brian Behlendorf
|
86bf16802f
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:31:46 -08:00 |
|
Brian Behlendorf
|
ce135674d9
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-16 14:31:45 -08:00 |
|
Brian Behlendorf
|
681d703126
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:31:41 -08:00 |
|
Brian Behlendorf
|
6f3ba08df3
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-16 14:31:40 -08:00 |
|
Brian Behlendorf
|
6a6da5a14d
|
Minor verbage cleanup
|
2009-01-16 14:29:31 -08:00 |
|
Brian Behlendorf
|
6c33b5b136
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:51 -08:00 |
|
Brian Behlendorf
|
2cc43bc132
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-16 14:00:49 -08:00 |
|
Brian Behlendorf
|
c9467451f2
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:46 -08:00 |
|
Brian Behlendorf
|
11851b8688
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-16 14:00:44 -08:00 |
|
Brian Behlendorf
|
74eb4f22f5
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:41 -08:00 |
|
Brian Behlendorf
|
2c988f7bbe
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-16 14:00:40 -08:00 |
|
Brian Behlendorf
|
15596e1044
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:37 -08:00 |
|
Brian Behlendorf
|
3fa7a9106c
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-16 14:00:35 -08:00 |
|
Brian Behlendorf
|
76a26e184f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:32 -08:00 |
|
Brian Behlendorf
|
fc48083154
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-16 14:00:30 -08:00 |
|
Brian Behlendorf
|
403f34a64e
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:27 -08:00 |
|
Brian Behlendorf
|
13a52fcd1b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-16 14:00:26 -08:00 |
|
Brian Behlendorf
|
8314348579
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:23 -08:00 |
|
Brian Behlendorf
|
207be36071
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-16 14:00:21 -08:00 |
|
Brian Behlendorf
|
730005c27a
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:18 -08:00 |
|
Brian Behlendorf
|
ad73b5c7e0
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-16 14:00:17 -08:00 |
|
Brian Behlendorf
|
2c1cf5909d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:13 -08:00 |
|
Brian Behlendorf
|
2da6fd7748
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-16 14:00:12 -08:00 |
|
Brian Behlendorf
|
65b04c3c53
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:09 -08:00 |
|
Brian Behlendorf
|
97b6705e4d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-16 14:00:07 -08:00 |
|
Brian Behlendorf
|
437297089f
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:00:04 -08:00 |
|
Brian Behlendorf
|
903e9766e0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-16 14:00:03 -08:00 |
|
Brian Behlendorf
|
b6be0bc2a9
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:59 -08:00 |
|
Brian Behlendorf
|
62b8b5d522
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-16 13:59:58 -08:00 |
|
Brian Behlendorf
|
60d590b8e2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:55 -08:00 |
|
Brian Behlendorf
|
596d10539f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-16 13:59:53 -08:00 |
|
Brian Behlendorf
|
1e162c3a7a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-16 13:59:53 -08:00 |
|
Brian Behlendorf
|
875419bea5
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:47 -08:00 |
|
Brian Behlendorf
|
91641cf998
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 13:59:46 -08:00 |
|
Brian Behlendorf
|
393c858e47
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 13:59:45 -08:00 |
|
Brian Behlendorf
|
56499d6a1f
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:40 -08:00 |
|
Brian Behlendorf
|
24560b4a89
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-16 13:59:38 -08:00 |
|
Brian Behlendorf
|
c5efd9a592
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:35 -08:00 |
|
Brian Behlendorf
|
4940ced76e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-16 13:59:34 -08:00 |
|
Brian Behlendorf
|
e81d193083
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:31 -08:00 |
|
Brian Behlendorf
|
b06beb6b00
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-16 13:59:29 -08:00 |
|
Brian Behlendorf
|
af42ad9d44
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:26 -08:00 |
|
Brian Behlendorf
|
359119352d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-16 13:59:24 -08:00 |
|
Brian Behlendorf
|
31c90fdb18
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:21 -08:00 |
|
Brian Behlendorf
|
8ab7f62179
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-16 13:59:20 -08:00 |
|
Brian Behlendorf
|
4286515a97
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:17 -08:00 |
|
Brian Behlendorf
|
45fef4237b
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-16 13:59:15 -08:00 |
|
Brian Behlendorf
|
478615fc18
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-16 13:59:12 -08:00 |
|
Brian Behlendorf
|
b07191e068
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-16 13:59:10 -08:00 |
|
Brian Behlendorf
|
7b5ceef9df
|
Minor fixes
|
2009-01-16 13:57:12 -08:00 |