Brian Behlendorf
|
57799b7b5a
|
Resolve conflict
|
2008-12-11 15:40:14 -08:00 |
|
Brian Behlendorf
|
3399113552
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 15:39:25 -08:00 |
|
Brian Behlendorf
|
6b2c60acca
|
Moving lib/libspl to linux-libspl branch
|
2008-12-11 15:38:59 -08:00 |
|
Brian Behlendorf
|
34ff0011d5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:38 -08:00 |
|
Brian Behlendorf
|
1d99f33ba7
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 15:37:37 -08:00 |
|
Brian Behlendorf
|
f8be204f1e
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:34 -08:00 |
|
Brian Behlendorf
|
2093483b22
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-11 15:37:33 -08:00 |
|
Brian Behlendorf
|
aaa698b757
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:30 -08:00 |
|
Brian Behlendorf
|
28c80747e6
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 15:37:29 -08:00 |
|
Brian Behlendorf
|
4a5e8430e3
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:26 -08:00 |
|
Brian Behlendorf
|
78d5afbca6
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 15:37:25 -08:00 |
|
Brian Behlendorf
|
bc92bf2bc6
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:22 -08:00 |
|
Brian Behlendorf
|
48089b4ae5
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-11 15:37:21 -08:00 |
|
Brian Behlendorf
|
72dc4bfb77
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 15:37:18 -08:00 |
|
Brian Behlendorf
|
3124a30d5e
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:18 -08:00 |
|
Brian Behlendorf
|
a44e77200c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:15 -08:00 |
|
Brian Behlendorf
|
ff97fc8dff
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-11 15:37:14 -08:00 |
|
Brian Behlendorf
|
1dc911d88d
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:11 -08:00 |
|
Brian Behlendorf
|
c2ccbc5a94
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 15:37:10 -08:00 |
|
Brian Behlendorf
|
4e6b0eb6c7
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:07 -08:00 |
|
Brian Behlendorf
|
b4e3a4f70d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 15:37:06 -08:00 |
|
Brian Behlendorf
|
ec48e7c704
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:37:03 -08:00 |
|
Brian Behlendorf
|
98e19f56b5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 15:37:02 -08:00 |
|
Brian Behlendorf
|
58f682cf5f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:59 -08:00 |
|
Brian Behlendorf
|
a7d5db6322
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 15:36:58 -08:00 |
|
Brian Behlendorf
|
bc79b3a628
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 15:36:58 -08:00 |
|
Brian Behlendorf
|
23267c02dc
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:53 -08:00 |
|
Brian Behlendorf
|
ed9de0316a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 15:36:52 -08:00 |
|
Brian Behlendorf
|
e24a59a697
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 15:36:51 -08:00 |
|
Brian Behlendorf
|
03a60f7f37
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:46 -08:00 |
|
Brian Behlendorf
|
f3dc282dd1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 15:36:45 -08:00 |
|
Brian Behlendorf
|
091416d39b
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:42 -08:00 |
|
Brian Behlendorf
|
2ec3e45fc1
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-11 15:36:41 -08:00 |
|
Brian Behlendorf
|
ee17768d94
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 15:36:38 -08:00 |
|
Brian Behlendorf
|
bed3e61143
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:38 -08:00 |
|
Brian Behlendorf
|
110f5e4ea1
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:35 -08:00 |
|
Brian Behlendorf
|
d195f28aad
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-11 15:36:34 -08:00 |
|
Brian Behlendorf
|
73fcb841e6
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:31 -08:00 |
|
Brian Behlendorf
|
5c38b9edb1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-11 15:36:30 -08:00 |
|
Brian Behlendorf
|
93a83ab40a
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:27 -08:00 |
|
Brian Behlendorf
|
550886841a
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-11 15:36:26 -08:00 |
|
Brian Behlendorf
|
2b86faed0a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:23 -08:00 |
|
Brian Behlendorf
|
bcc03544c9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-11 15:36:22 -08:00 |
|
Brian Behlendorf
|
cf06f2f58f
|
Whoops put these back
|
2008-12-11 15:34:32 -08:00 |
|
Brian Behlendorf
|
652388f3fb
|
Moving all lib/libspl contexts to linux-libspl branch
|
2008-12-11 15:31:48 -08:00 |
|
Brian Behlendorf
|
b62b4773d1
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:28:31 -08:00 |
|
Brian Behlendorf
|
a2d1d32c17
|
move vdev_disk to it's new home
|
2008-12-11 15:26:36 -08:00 |
|
Brian Behlendorf
|
fb24b30a5e
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:24:56 -08:00 |
|
Brian Behlendorf
|
526bb71c86
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 15:24:53 -08:00 |
|
Brian Behlendorf
|
efc21c477d
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:24:37 -08:00 |