Brian Behlendorf
|
b9181dc2a0
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-10 21:25:52 -07:00 |
|
Brian Behlendorf
|
8bf4b3eeda
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-10 21:25:48 -07:00 |
|
Brian Behlendorf
|
dab1dabf17
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-10 21:25:39 -07:00 |
|
Brian Behlendorf
|
f69ecb664b
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-10 21:25:36 -07:00 |
|
Brian Behlendorf
|
36860ec1a8
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
module/Makefile.in
|
2009-03-10 21:23:17 -07:00 |
|
Brian Behlendorf
|
11bcfaa5ef
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-10 21:22:15 -07:00 |
|
Brian Behlendorf
|
c8e569dd1c
|
Build system and packaging (RPM support) (Part 2)
Complete support for dist install srpm and rpm make targets.
|
2009-03-10 21:13:30 -07:00 |
|
Brian Behlendorf
|
8b1922e034
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:30:26 -07:00 |
|
Brian Behlendorf
|
e69277d306
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-10 11:30:23 -07:00 |
|
Brian Behlendorf
|
b52e76b382
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:30:14 -07:00 |
|
Brian Behlendorf
|
093ec863e4
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-10 11:30:09 -07:00 |
|
Brian Behlendorf
|
29579baf66
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:30:00 -07:00 |
|
Brian Behlendorf
|
8335a932ab
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-10 11:29:57 -07:00 |
|
Brian Behlendorf
|
b7ab0a0e4f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:29:48 -07:00 |
|
Brian Behlendorf
|
c9c44d22d0
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-10 11:29:46 -07:00 |
|
Brian Behlendorf
|
635de9a1a3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:29:36 -07:00 |
|
Brian Behlendorf
|
a98ae7ffe2
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
Conflicts:
configure.ac
|
2009-03-10 11:29:29 -07:00 |
|
Brian Behlendorf
|
ec507b7579
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:28:26 -07:00 |
|
Brian Behlendorf
|
0daf43cab6
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-10 11:28:21 -07:00 |
|
Brian Behlendorf
|
66769afd2f
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:28:12 -07:00 |
|
Brian Behlendorf
|
93da8b5ef7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-10 11:28:09 -07:00 |
|
Brian Behlendorf
|
35e3953aeb
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:28:01 -07:00 |
|
Brian Behlendorf
|
91225d2f7d
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-10 11:27:58 -07:00 |
|
Brian Behlendorf
|
395e661ee7
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:27:49 -07:00 |
|
Brian Behlendorf
|
e873410b9a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-10 11:27:43 -07:00 |
|
Brian Behlendorf
|
b042e5a9a0
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:27:34 -07:00 |
|
Brian Behlendorf
|
523957c53f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-10 11:27:31 -07:00 |
|
Brian Behlendorf
|
919a79a7d6
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:27:22 -07:00 |
|
Brian Behlendorf
|
e59bfd45fe
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-10 11:27:19 -07:00 |
|
Brian Behlendorf
|
63ddfcbb26
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:27:07 -07:00 |
|
Brian Behlendorf
|
88527141d6
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-10 11:27:05 -07:00 |
|
Brian Behlendorf
|
67907f54f5
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:26:55 -07:00 |
|
Brian Behlendorf
|
e7eb4c8c7e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-10 11:26:52 -07:00 |
|
Brian Behlendorf
|
5485d7e47f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-10 11:26:51 -07:00 |
|
Brian Behlendorf
|
933571b352
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:26:33 -07:00 |
|
Brian Behlendorf
|
36bfb764a4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-10 11:26:30 -07:00 |
|
Brian Behlendorf
|
0f6b999d95
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-10 11:26:29 -07:00 |
|
Brian Behlendorf
|
30431b7b8d
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:26:13 -07:00 |
|
Brian Behlendorf
|
418a437230
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-10 11:26:10 -07:00 |
|
Brian Behlendorf
|
a9abdae5b6
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:26:01 -07:00 |
|
Brian Behlendorf
|
f7fafd6c0f
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-10 11:25:58 -07:00 |
|
Brian Behlendorf
|
95dd7e70cb
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:25:48 -07:00 |
|
Brian Behlendorf
|
d371636491
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-10 11:25:44 -07:00 |
|
Brian Behlendorf
|
890c27c8ff
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:25:35 -07:00 |
|
Brian Behlendorf
|
d8900392ac
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-10 11:25:33 -07:00 |
|
Brian Behlendorf
|
6897fcf756
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:25:24 -07:00 |
|
Brian Behlendorf
|
c822955b92
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-10 11:25:20 -07:00 |
|
Brian Behlendorf
|
08e37c48c7
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-10 11:25:11 -07:00 |
|
Brian Behlendorf
|
60370eb826
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-10 11:25:09 -07:00 |
|
Brian Behlendorf
|
1d6b5183d3
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
configure.ac
|
2009-03-10 11:22:53 -07:00 |