Brian Behlendorf
|
a0499b7d21
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:55:29 -08:00 |
|
Brian Behlendorf
|
653cd283da
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 16:55:27 -08:00 |
|
Brian Behlendorf
|
46ee7d0013
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:55:22 -08:00 |
|
Brian Behlendorf
|
441b2cc81d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-11 16:55:20 -08:00 |
|
Brian Behlendorf
|
f18b69afa5
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:55:15 -08:00 |
|
Brian Behlendorf
|
90b2448c7c
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-11 16:55:12 -08:00 |
|
Brian Behlendorf
|
70e2ec3771
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:55:06 -08:00 |
|
Brian Behlendorf
|
9950929503
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-11 16:55:04 -08:00 |
|
Brian Behlendorf
|
7a9fc78c10
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:54:58 -08:00 |
|
Brian Behlendorf
|
43ffb15ec6
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-11 16:54:55 -08:00 |
|
Brian Behlendorf
|
f55d6ad125
|
Remove bugus checks for now
|
2008-12-11 16:51:09 -08:00 |
|
Brian Behlendorf
|
30c38654e4
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:49:42 -08:00 |
|
Brian Behlendorf
|
3540a5e4e5
|
Readd
|
2008-12-11 16:46:07 -08:00 |
|
Brian Behlendorf
|
1837c9d94e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:45:13 -08:00 |
|
Brian Behlendorf
|
e0104bd422
|
Remove so they can be easily readded
|
2008-12-11 16:41:23 -08:00 |
|
Brian Behlendorf
|
a5ea185d73
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:35:33 -08:00 |
|
Brian Behlendorf
|
058e5aabac
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:35:32 -08:00 |
|
Brian Behlendorf
|
6535464bdb
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-11 16:35:30 -08:00 |
|
Brian Behlendorf
|
0a9b405aec
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:35:26 -08:00 |
|
Brian Behlendorf
|
e7ffc42caf
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 16:35:24 -08:00 |
|
Brian Behlendorf
|
11152f7318
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:35:18 -08:00 |
|
Brian Behlendorf
|
7bedbf9b52
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 16:35:16 -08:00 |
|
Brian Behlendorf
|
1a23c2fabb
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:35:08 -08:00 |
|
Brian Behlendorf
|
ba1a2fab86
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-11 16:35:06 -08:00 |
|
Brian Behlendorf
|
a0ccc06709
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:59 -08:00 |
|
Brian Behlendorf
|
8f77804814
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 16:34:57 -08:00 |
|
Brian Behlendorf
|
e2d4e043ea
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:52 -08:00 |
|
Brian Behlendorf
|
85ddb2d6c0
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-11 16:34:51 -08:00 |
|
Brian Behlendorf
|
c0263a6272
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:44 -08:00 |
|
Brian Behlendorf
|
9f20c1541f
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 16:34:42 -08:00 |
|
Brian Behlendorf
|
b2587f201d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:36 -08:00 |
|
Brian Behlendorf
|
028e88ac61
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 16:34:34 -08:00 |
|
Brian Behlendorf
|
0dd42aefee
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:27 -08:00 |
|
Brian Behlendorf
|
2ae6a4865f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 16:34:25 -08:00 |
|
Brian Behlendorf
|
7c61040e9a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:17 -08:00 |
|
Brian Behlendorf
|
531ffc59df
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 16:34:15 -08:00 |
|
Brian Behlendorf
|
5332504adb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 16:34:13 -08:00 |
|
Brian Behlendorf
|
82fecb3d88
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:01 -08:00 |
|
Brian Behlendorf
|
aacdcf8d61
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 16:34:00 -08:00 |
|
Brian Behlendorf
|
c95fabb9c7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 16:33:58 -08:00 |
|
Brian Behlendorf
|
8d9de103d6
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:46 -08:00 |
|
Brian Behlendorf
|
fe1de9437c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 16:33:44 -08:00 |
|
Brian Behlendorf
|
1e117be6b3
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:38 -08:00 |
|
Brian Behlendorf
|
d10da26535
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-11 16:33:36 -08:00 |
|
Brian Behlendorf
|
24485fb6e0
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:30 -08:00 |
|
Brian Behlendorf
|
5fd7f8a200
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 16:33:28 -08:00 |
|
Brian Behlendorf
|
1f1f0de51e
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:22 -08:00 |
|
Brian Behlendorf
|
537c730876
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-11 16:33:20 -08:00 |
|
Brian Behlendorf
|
58c5a6c4c5
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:13 -08:00 |
|
Brian Behlendorf
|
576b61efb1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-11 16:33:11 -08:00 |