Brian Behlendorf
|
ea212615f5
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 12:13:24 -08:00 |
|
Brian Behlendorf
|
7d65d6498c
|
Remove dependency
|
2008-12-22 12:09:51 -08:00 |
|
Brian Behlendorf
|
08a400676b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 12:09:15 -08:00 |
|
Brian Behlendorf
|
2bc1c82863
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-22 12:09:11 -08:00 |
|
Brian Behlendorf
|
a6d6f31db6
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:09:08 -08:00 |
|
Brian Behlendorf
|
d7d260b870
|
Removing branch to readd under new name
|
2008-12-22 12:05:11 -08:00 |
|
Brian Behlendorf
|
bf671ef673
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 11:58:29 -08:00 |
|
Brian Behlendorf
|
8d521165bc
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-22 11:58:28 -08:00 |
|
Brian Behlendorf
|
3533b7ec8c
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:58:27 -08:00 |
|
Brian Behlendorf
|
683dc8d98e
|
Fix up headers
|
2008-12-22 11:54:35 -08:00 |
|
Brian Behlendorf
|
4f1e40767b
|
Refresh autogen products
|
2008-12-22 11:46:00 -08:00 |
|
Brian Behlendorf
|
397cdbf7f8
|
Fix typo
|
2008-12-22 11:43:14 -08:00 |
|
Brian Behlendorf
|
31ff40b9ec
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 11:42:32 -08:00 |
|
Brian Behlendorf
|
a5b35dfa52
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-22 11:42:30 -08:00 |
|
Brian Behlendorf
|
af22b14c12
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:29 -08:00 |
|
Brian Behlendorf
|
0cf01a7c69
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 11:42:28 -08:00 |
|
Brian Behlendorf
|
2f9329e98d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:25 -08:00 |
|
Brian Behlendorf
|
d7fafdb56e
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 11:42:23 -08:00 |
|
Brian Behlendorf
|
a5eb7a6291
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:20 -08:00 |
|
Brian Behlendorf
|
9a57b35c98
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 11:42:18 -08:00 |
|
Brian Behlendorf
|
e999025453
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:15 -08:00 |
|
Brian Behlendorf
|
300ff503d4
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:42:13 -08:00 |
|
Brian Behlendorf
|
8af913c7b9
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:10 -08:00 |
|
Brian Behlendorf
|
af113488c1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 11:42:08 -08:00 |
|
Brian Behlendorf
|
6ce555ffbf
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:05 -08:00 |
|
Brian Behlendorf
|
d0cacda56c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 11:42:04 -08:00 |
|
Brian Behlendorf
|
8abad5a8c6
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:42:01 -08:00 |
|
Brian Behlendorf
|
f752d29d6c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 11:41:59 -08:00 |
|
Brian Behlendorf
|
7ecfa93229
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:56 -08:00 |
|
Brian Behlendorf
|
52a84a3394
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 11:41:54 -08:00 |
|
Brian Behlendorf
|
c4992a80c0
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:51 -08:00 |
|
Brian Behlendorf
|
7b4bf789e9
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 11:41:50 -08:00 |
|
Brian Behlendorf
|
72528c46ed
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:46 -08:00 |
|
Brian Behlendorf
|
6d13a998fb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 11:41:45 -08:00 |
|
Brian Behlendorf
|
2f88b8551f
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:41 -08:00 |
|
Brian Behlendorf
|
86392b70ad
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 11:41:40 -08:00 |
|
Brian Behlendorf
|
740ca1e787
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:37 -08:00 |
|
Brian Behlendorf
|
b49ce65660
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
fa9a05e496
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
f546821655
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:29 -08:00 |
|
Brian Behlendorf
|
f9e9bba2a4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 11:41:28 -08:00 |
|
Brian Behlendorf
|
187be3051e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:41:27 -08:00 |
|
Brian Behlendorf
|
d812a197ef
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:22 -08:00 |
|
Brian Behlendorf
|
de4c82e397
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 11:41:20 -08:00 |
|
Brian Behlendorf
|
0734d455b6
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:17 -08:00 |
|
Brian Behlendorf
|
85797a38b0
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 11:41:15 -08:00 |
|
Brian Behlendorf
|
b19050b6aa
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:12 -08:00 |
|
Brian Behlendorf
|
7f2da73568
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 11:41:11 -08:00 |
|
Brian Behlendorf
|
b0ca34bbd4
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:41:08 -08:00 |
|
Brian Behlendorf
|
7c2c27b087
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 11:41:06 -08:00 |