Brian Behlendorf
|
04b02ab4e9
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:51 -08:00 |
|
Brian Behlendorf
|
636072bc8a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-16 14:32:50 -08:00 |
|
Brian Behlendorf
|
60fdf40f23
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:46 -08:00 |
|
Brian Behlendorf
|
b4ed85e418
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-16 14:32:45 -08:00 |
|
Brian Behlendorf
|
3dad074d76
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:42 -08:00 |
|
Brian Behlendorf
|
59c875601e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-16 14:32:40 -08:00 |
|
Brian Behlendorf
|
d3015409b3
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:37 -08:00 |
|
Brian Behlendorf
|
df2d0f3ca6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-16 14:32:36 -08:00 |
|
Brian Behlendorf
|
e0773a7c0f
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:33 -08:00 |
|
Brian Behlendorf
|
d372d77929
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-16 14:32:31 -08:00 |
|
Brian Behlendorf
|
fe4600648d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:28 -08:00 |
|
Brian Behlendorf
|
aa0e49e28b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-16 14:32:27 -08:00 |
|
Brian Behlendorf
|
d40eb3c77c
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:23 -08:00 |
|
Brian Behlendorf
|
e275d172ff
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-16 14:32:22 -08:00 |
|
Brian Behlendorf
|
24b3dac3ba
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-16 14:32:21 -08:00 |
|
Brian Behlendorf
|
6ccc390a61
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:16 -08:00 |
|
Brian Behlendorf
|
86f5d77de7
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 14:32:15 -08:00 |
|
Brian Behlendorf
|
3532303b80
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 14:32:14 -08:00 |
|
Brian Behlendorf
|
23fd66152b
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:09 -08:00 |
|
Brian Behlendorf
|
5f5d8ef031
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-16 14:32:08 -08:00 |
|
Brian Behlendorf
|
b5652b5ee6
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:04 -08:00 |
|
Brian Behlendorf
|
a0c554d850
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-16 14:32:03 -08:00 |
|
Brian Behlendorf
|
863b795661
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:32:00 -08:00 |
|
Brian Behlendorf
|
88b350122a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-16 14:31:58 -08:00 |
|
Brian Behlendorf
|
a74fcd9957
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:31:55 -08:00 |
|
Brian Behlendorf
|
b78dd75e16
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-16 14:31:54 -08:00 |
|
Brian Behlendorf
|
25cd907764
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-16 14:31:51 -08:00 |
|
Brian Behlendorf
|
b91884fce3
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-16 14:31:49 -08:00 |
|
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 |