Brian Behlendorf
|
1f6be4d799
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:21:29 -07:00 |
|
Brian Behlendorf
|
6ca9d4372a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-06-08 11:21:25 -07:00 |
|
Brian Behlendorf
|
b77a00faba
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:21:04 -07:00 |
|
Brian Behlendorf
|
f1406cd00e
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-06-08 11:20:59 -07:00 |
|
Brian Behlendorf
|
ceb772b54a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:20:36 -07:00 |
|
Brian Behlendorf
|
0fbaa8ed41
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-06-08 11:20:32 -07:00 |
|
Brian Behlendorf
|
0c1b0d5935
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:20:11 -07:00 |
|
Brian Behlendorf
|
9a25ec2567
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-06-08 11:20:06 -07:00 |
|
Brian Behlendorf
|
30054e3272
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:19:42 -07:00 |
|
Brian Behlendorf
|
df7fd04770
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-06-08 11:19:36 -07:00 |
|
Brian Behlendorf
|
e8880abb13
|
Readd accidentally dropped COPYRIGHT, it just references the
OPENSOLARIS.LICENSE but it should still be in place.
|
2009-06-08 11:01:13 -07:00 |
|
Brian Behlendorf
|
5f6dec2c7d
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:38:51 -07:00 |
|
Brian Behlendorf
|
9f4fdec42d
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-05-22 16:38:49 -07:00 |
|
Brian Behlendorf
|
e6abb95f35
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:38:45 -07:00 |
|
Brian Behlendorf
|
2a744e0bbb
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-05-22 16:38:43 -07:00 |
|
Brian Behlendorf
|
9d191d45bb
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:38:38 -07:00 |
|
Brian Behlendorf
|
3537438ee7
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-05-22 16:38:36 -07:00 |
|
Brian Behlendorf
|
bf426953af
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:38:30 -07:00 |
|
Brian Behlendorf
|
24eb553810
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-05-22 16:38:29 -07:00 |
|
Brian Behlendorf
|
75f965a751
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:38:23 -07:00 |
|
Brian Behlendorf
|
2384f8a72f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-05-22 16:38:21 -07:00 |
|
Brian Behlendorf
|
a134e879a1
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:38:16 -07:00 |
|
Brian Behlendorf
|
4e048c65aa
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-05-22 16:38:14 -07:00 |
|
Brian Behlendorf
|
8e47bf19bf
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:38:09 -07:00 |
|
Brian Behlendorf
|
58a80b1cd3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-05-22 16:38:07 -07:00 |
|
Brian Behlendorf
|
c8982a94b4
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:38:02 -07:00 |
|
Brian Behlendorf
|
16627ea0a0
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-05-22 16:38:00 -07:00 |
|
Brian Behlendorf
|
a1c28ce918
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:37:55 -07:00 |
|
Brian Behlendorf
|
21ee362da7
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-05-22 16:37:53 -07:00 |
|
Brian Behlendorf
|
5451cf2515
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:37:47 -07:00 |
|
Brian Behlendorf
|
6ca7c06bc5
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-05-22 16:37:46 -07:00 |
|
Brian Behlendorf
|
cbcdc9784e
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:37:40 -07:00 |
|
Brian Behlendorf
|
536b930527
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-05-22 16:37:38 -07:00 |
|
Brian Behlendorf
|
cffd8ce4d3
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:37:33 -07:00 |
|
Brian Behlendorf
|
a0cbacda86
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-05-22 16:37:31 -07:00 |
|
Brian Behlendorf
|
df6c8453b0
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-05-22 16:37:30 -07:00 |
|
Brian Behlendorf
|
b3ff22fd38
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:37:21 -07:00 |
|
Brian Behlendorf
|
0cba0fc350
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-05-22 16:37:19 -07:00 |
|
Brian Behlendorf
|
40e75795ca
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-05-22 16:37:19 -07:00 |
|
Brian Behlendorf
|
24645dbd5f
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:37:09 -07:00 |
|
Brian Behlendorf
|
38350f860d
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-05-22 16:37:07 -07:00 |
|
Brian Behlendorf
|
dff2ec2ef7
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:37:02 -07:00 |
|
Brian Behlendorf
|
f2f1b9fbbe
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-05-22 16:37:00 -07:00 |
|
Brian Behlendorf
|
c0d31a87ad
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:36:55 -07:00 |
|
Brian Behlendorf
|
4a2266c1d5
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-05-22 16:36:53 -07:00 |
|
Brian Behlendorf
|
fa393d3a7e
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:36:47 -07:00 |
|
Brian Behlendorf
|
300575508d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-05-22 16:36:45 -07:00 |
|
Brian Behlendorf
|
584a46302b
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:36:40 -07:00 |
|
Brian Behlendorf
|
36e3534561
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-05-22 16:36:38 -07:00 |
|
Brian Behlendorf
|
012053790d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-05-22 16:36:33 -07:00 |