Brian Behlendorf
|
c28758b176
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:08:53 -08:00 |
|
Brian Behlendorf
|
1c03bb100f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 16:08:49 -08:00 |
|
Brian Behlendorf
|
afeb65cd2a
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:08:41 -08:00 |
|
Brian Behlendorf
|
b10b141ef8
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 16:08:36 -08:00 |
|
Brian Behlendorf
|
0473b59da9
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:08:29 -08:00 |
|
Brian Behlendorf
|
659f7fdb0f
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 16:08:25 -08:00 |
|
Brian Behlendorf
|
00cee1c001
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:08:18 -08:00 |
|
Brian Behlendorf
|
65b68493f1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 16:08:13 -08:00 |
|
Brian Behlendorf
|
1e090ee887
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:08:06 -08:00 |
|
Brian Behlendorf
|
414bc05d3a
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 16:08:01 -08:00 |
|
Brian Behlendorf
|
48f2699843
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:07:55 -08:00 |
|
Brian Behlendorf
|
f6ec745967
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 16:07:52 -08:00 |
|
Brian Behlendorf
|
90ffab4e9c
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:07:45 -08:00 |
|
Brian Behlendorf
|
5ab7c7ed3a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 16:07:41 -08:00 |
|
Brian Behlendorf
|
27206de6e1
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:07:34 -08:00 |
|
Brian Behlendorf
|
1d092e0490
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 16:07:29 -08:00 |
|
Brian Behlendorf
|
ef7fd1aa08
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 16:07:28 -08:00 |
|
Brian Behlendorf
|
4a867c7d37
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:07:16 -08:00 |
|
Brian Behlendorf
|
56488ad9e6
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 16:07:12 -08:00 |
|
Brian Behlendorf
|
f0d3cb50d3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 16:07:11 -08:00 |
|
Brian Behlendorf
|
2be0d54b88
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:07:01 -08:00 |
|
Brian Behlendorf
|
adfcf0926d
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 16:06:56 -08:00 |
|
Brian Behlendorf
|
bac8f9281a
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:49 -08:00 |
|
Brian Behlendorf
|
b97f7d8713
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 16:06:45 -08:00 |
|
Brian Behlendorf
|
1c23c712dc
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:39 -08:00 |
|
Brian Behlendorf
|
cee3842c8d
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 16:06:35 -08:00 |
|
Brian Behlendorf
|
245faeadf2
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:28 -08:00 |
|
Brian Behlendorf
|
9ac24dd140
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 16:06:26 -08:00 |
|
Brian Behlendorf
|
81369bf5d8
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:19 -08:00 |
|
Brian Behlendorf
|
08b0046039
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 16:06:14 -08:00 |
|
Brian Behlendorf
|
8e752abc83
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:08 -08:00 |
|
Brian Behlendorf
|
61c4ad3067
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 16:06:05 -08:00 |
|
Brian Behlendorf
|
8ea2bead50
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:00 -08:00 |
|
Brian Behlendorf
|
b4ec4a0834
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 16:05:54 -08:00 |
|
Brian Behlendorf
|
419cff0fd3
|
Add more more missing headers
|
2008-12-22 16:02:08 -08:00 |
|
Brian Behlendorf
|
575903cb9a
|
Comment out zfs_mount/umount
|
2008-12-22 16:01:04 -08:00 |
|
Brian Behlendorf
|
cf5eae37b3
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:53:01 -08:00 |
|
Brian Behlendorf
|
96473c9eff
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 15:52:59 -08:00 |
|
Brian Behlendorf
|
a545e458c0
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:56 -08:00 |
|
Brian Behlendorf
|
3c5beacfab
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 15:52:54 -08:00 |
|
Brian Behlendorf
|
d26ca6dbe1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:51 -08:00 |
|
Brian Behlendorf
|
bd56b89546
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 15:52:50 -08:00 |
|
Brian Behlendorf
|
b9b512e7d3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:46 -08:00 |
|
Brian Behlendorf
|
ea765bd3c0
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 15:52:44 -08:00 |
|
Brian Behlendorf
|
4b56ce49fd
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:41 -08:00 |
|
Brian Behlendorf
|
515c44c49a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 15:52:39 -08:00 |
|
Brian Behlendorf
|
aa3b35cc75
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:36 -08:00 |
|
Brian Behlendorf
|
856299f80b
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 15:52:34 -08:00 |
|
Brian Behlendorf
|
9b570821cb
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:52:31 -08:00 |
|
Brian Behlendorf
|
2f61f196ea
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 15:52:29 -08:00 |