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 |
|
Brian Behlendorf
|
b0f3a8b58e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:14 -08:00 |
|
Brian Behlendorf
|
82a64a2e76
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 10:18:13 -08:00 |
|
Brian Behlendorf
|
796cb52da5
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:18:13 -08:00 |
|
Brian Behlendorf
|
76a06d51cd
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:08 -08:00 |
|
Brian Behlendorf
|
80c97a17a8
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 10:18:06 -08:00 |
|
Brian Behlendorf
|
4c5130e059
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 10:18:03 -08:00 |
|
Brian Behlendorf
|
e1b18ebe43
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:03 -08:00 |
|
Brian Behlendorf
|
ea8df8131a
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:18:00 -08:00 |
|
Brian Behlendorf
|
61e1776e68
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 10:17:59 -08:00 |
|
Brian Behlendorf
|
5c6e8346f5
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:17:56 -08:00 |
|
Brian Behlendorf
|
0dc7ebab7f
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 10:17:55 -08:00 |
|
Brian Behlendorf
|
7c7a5db31b
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:17:52 -08:00 |
|
Brian Behlendorf
|
a5cd93f149
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 10:17:51 -08:00 |
|
Brian Behlendorf
|
aa774f5a74
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:17:48 -08:00 |
|
Brian Behlendorf
|
629fe0fb80
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 10:17:47 -08:00 |
|
Brian Behlendorf
|
9893519996
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:17:44 -08:00 |
|
Brian Behlendorf
|
083dd96dac
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 10:17:43 -08:00 |
|
Brian Behlendorf
|
2d5777f9a7
|
Use AM_CFLAGS
|
2008-12-12 10:15:59 -08:00 |
|
Brian Behlendorf
|
859b917fca
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:13:20 -08:00 |
|
Brian Behlendorf
|
662df0d70a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:13:19 -08:00 |
|
Brian Behlendorf
|
787d56685e
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:13:16 -08:00 |
|
Brian Behlendorf
|
8ea1e1e77a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 10:13:15 -08:00 |
|
Brian Behlendorf
|
3ef91f6b45
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:13:12 -08:00 |
|
Brian Behlendorf
|
78d663ba36
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 10:13:11 -08:00 |
|
Brian Behlendorf
|
ede5bbc9a4
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:13:08 -08:00 |
|
Brian Behlendorf
|
4b7304dab5
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 10:13:07 -08:00 |
|
Brian Behlendorf
|
c63a1e0e59
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:13:04 -08:00 |
|
Brian Behlendorf
|
7eb681ef02
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 10:13:03 -08:00 |