Brian Behlendorf
|
8ddca9fded
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-06-08 11:27:36 -07:00 |
|
Brian Behlendorf
|
14eac5c102
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:27:13 -07:00 |
|
Brian Behlendorf
|
aaba7f070a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-06-08 11:27:10 -07:00 |
|
Brian Behlendorf
|
6029ecc487
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:26:44 -07:00 |
|
Brian Behlendorf
|
8dcca1e68f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-06-08 11:26:40 -07:00 |
|
Brian Behlendorf
|
d8432883ba
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:26:17 -07:00 |
|
Brian Behlendorf
|
2e3cacb080
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-06-08 11:26:13 -07:00 |
|
Brian Behlendorf
|
27e5e14b87
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:25:53 -07:00 |
|
Brian Behlendorf
|
4a26444996
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-06-08 11:25:49 -07:00 |
|
Brian Behlendorf
|
559656fdbc
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:25:29 -07:00 |
|
Brian Behlendorf
|
e65efcc139
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-06-08 11:25:25 -07:00 |
|
Brian Behlendorf
|
9ed32c6bae
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:25:05 -07:00 |
|
Brian Behlendorf
|
c9a9f1880b
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-06-08 11:25:01 -07:00 |
|
Brian Behlendorf
|
1303ff4c89
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:24:40 -07:00 |
|
Brian Behlendorf
|
0935d3a06a
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-06-08 11:24:36 -07:00 |
|
Brian Behlendorf
|
a315179c18
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:24:17 -07:00 |
|
Brian Behlendorf
|
192bf1a471
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-06-08 11:24:12 -07:00 |
|
Brian Behlendorf
|
5d1cf1bedf
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:23:52 -07:00 |
|
Brian Behlendorf
|
debf672431
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-06-08 11:23:48 -07:00 |
|
Brian Behlendorf
|
511ab7cb47
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-06-08 11:23:46 -07:00 |
|
Brian Behlendorf
|
e1f2c164ed
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:23:10 -07:00 |
|
Brian Behlendorf
|
8c6b11d9ca
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-06-08 11:23:06 -07:00 |
|
Brian Behlendorf
|
cbeb9b8f88
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-06-08 11:23:04 -07:00 |
|
Brian Behlendorf
|
ef1520e403
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:22:22 -07:00 |
|
Brian Behlendorf
|
bf2b42f5d2
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-06-08 11:22:18 -07:00 |
|
Brian Behlendorf
|
1fac93f26d
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-06-08 11:21:56 -07:00 |
|
Brian Behlendorf
|
e8d18ed6c5
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-06-08 11:21:52 -07:00 |
|
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 |