Brian Behlendorf
|
1ec5affddd
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 10:30:09 -08:00 |
|
Brian Behlendorf
|
c33e7cbe5a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 10:30:05 -08:00 |
|
Brian Behlendorf
|
0a9d92e293
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:30:05 -08:00 |
|
Brian Behlendorf
|
d00144da6d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:30:01 -08:00 |
|
Brian Behlendorf
|
29e04b9fdd
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 10:30:00 -08:00 |
|
Brian Behlendorf
|
b9423a9fc4
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:29:58 -08:00 |
|
Brian Behlendorf
|
d1b07069fa
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:29:57 -08:00 |
|
Brian Behlendorf
|
3fa572fe20
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:29:56 -08:00 |
|
Brian Behlendorf
|
57a112958f
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:29:51 -08:00 |
|
Brian Behlendorf
|
409daa686f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:29:50 -08:00 |
|
Brian Behlendorf
|
3f6c4fac7c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 10:29:50 -08:00 |
|
Brian Behlendorf
|
f3441cd32b
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:29:44 -08:00 |
|
Brian Behlendorf
|
c4ad47d379
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 10:29:43 -08:00 |
|
Brian Behlendorf
|
87b83e4e8c
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:29:40 -08:00 |
|
Brian Behlendorf
|
63863e0680
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 10:29:39 -08:00 |
|
Brian Behlendorf
|
86f4fa399d
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:29:37 -08:00 |
|
Brian Behlendorf
|
02c8e67dd8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 10:29:36 -08:00 |
|
Brian Behlendorf
|
e4407a4b40
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:29:33 -08:00 |
|
Brian Behlendorf
|
d9fdfa049b
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 10:29:32 -08:00 |
|
Brian Behlendorf
|
2f7aa1f82a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:29:29 -08:00 |
|
Brian Behlendorf
|
a54c107c88
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 10:29:28 -08:00 |
|
Brian Behlendorf
|
c988750d15
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:29:25 -08:00 |
|
Brian Behlendorf
|
341affa29c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 10:29:24 -08:00 |
|
Brian Behlendorf
|
ef954c616c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:29:21 -08:00 |
|
Brian Behlendorf
|
c659f1ae79
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 10:29:20 -08:00 |
|
Brian Behlendorf
|
f429331a49
|
Remove redundant build options
|
2008-12-12 10:27:10 -08:00 |
|
Brian Behlendorf
|
d06634c325
|
Resolve shadow conflict with 'link' local
|
2008-12-12 10:24:38 -08:00 |
|
Brian Behlendorf
|
3c08d4f878
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:19:01 -08:00 |
|
Brian Behlendorf
|
444bdde2f2
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:19:00 -08:00 |
|
Brian Behlendorf
|
0b1622394b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 10:18:56 -08:00 |
|
Brian Behlendorf
|
3f13c06802
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:56 -08:00 |
|
Brian Behlendorf
|
a8c7fb2d36
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:53 -08:00 |
|
Brian Behlendorf
|
b8a90b4206
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 10:18:52 -08:00 |
|
Brian Behlendorf
|
25f5f5c86c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:49 -08:00 |
|
Brian Behlendorf
|
f88bc9a114
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 10:18:47 -08:00 |
|
Brian Behlendorf
|
a44d251b3c
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:44 -08:00 |
|
Brian Behlendorf
|
0adf7ad72a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 10:18:43 -08:00 |
|
Brian Behlendorf
|
f4261839d5
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:40 -08:00 |
|
Brian Behlendorf
|
7609f8a3b1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 10:18:39 -08:00 |
|
Brian Behlendorf
|
3064e16659
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:36 -08:00 |
|
Brian Behlendorf
|
929a8cdb72
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 10:18:35 -08:00 |
|
Brian Behlendorf
|
4a560e51ee
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:32 -08:00 |
|
Brian Behlendorf
|
51e34f68d5
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 10:18:31 -08:00 |
|
Brian Behlendorf
|
0ffacdc930
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:28 -08:00 |
|
Brian Behlendorf
|
fedbcd5734
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 10:18:27 -08:00 |
|
Brian Behlendorf
|
531ff19988
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:24 -08:00 |
|
Brian Behlendorf
|
a551a6e240
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 10:18:23 -08:00 |
|
Brian Behlendorf
|
ab4c1b270f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:21 -08:00 |
|
Brian Behlendorf
|
9d9a72e422
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:18:20 -08:00 |
|
Brian Behlendorf
|
a25da53921
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:18:19 -08:00 |