Brian Behlendorf
|
10581d228d
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 13:55:06 -08:00 |
|
Brian Behlendorf
|
a7e80a00d4
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:59 -08:00 |
|
Brian Behlendorf
|
5029749a10
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 13:54:58 -08:00 |
|
Brian Behlendorf
|
6bb3ee33be
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:51 -08:00 |
|
Brian Behlendorf
|
e1cd89d9ca
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 13:54:50 -08:00 |
|
Brian Behlendorf
|
af350a3373
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:44 -08:00 |
|
Brian Behlendorf
|
cc754bd77c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 13:54:41 -08:00 |
|
Brian Behlendorf
|
9a1ed84af3
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:36 -08:00 |
|
Brian Behlendorf
|
2115867e0d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 13:54:34 -08:00 |
|
Brian Behlendorf
|
bff6c87152
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:29 -08:00 |
|
Brian Behlendorf
|
b49bc8ff7e
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 13:54:26 -08:00 |
|
Brian Behlendorf
|
a1cdc1f4ec
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:21 -08:00 |
|
Brian Behlendorf
|
772de16021
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 13:54:18 -08:00 |
|
Brian Behlendorf
|
9c1f5de77b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:13 -08:00 |
|
Brian Behlendorf
|
d301978834
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 13:54:11 -08:00 |
|
Brian Behlendorf
|
13f3c7b4af
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:08 -08:00 |
|
Brian Behlendorf
|
720da6c345
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 13:54:06 -08:00 |
|
Brian Behlendorf
|
50c214f76a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:54:03 -08:00 |
|
Brian Behlendorf
|
587287f9bf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 13:54:01 -08:00 |
|
Brian Behlendorf
|
2f40e66354
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 13:54:00 -08:00 |
|
Brian Behlendorf
|
2ab656f779
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:55 -08:00 |
|
Brian Behlendorf
|
a092d83131
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 13:53:53 -08:00 |
|
Brian Behlendorf
|
f90df388c2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 13:53:53 -08:00 |
|
Brian Behlendorf
|
041870f090
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:47 -08:00 |
|
Brian Behlendorf
|
9aafcc12ef
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 13:53:45 -08:00 |
|
Brian Behlendorf
|
01b78d29a1
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:42 -08:00 |
|
Brian Behlendorf
|
1a19d4c375
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 13:53:40 -08:00 |
|
Brian Behlendorf
|
1bbfa5f58d
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:37 -08:00 |
|
Brian Behlendorf
|
7327bba1ac
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 13:53:35 -08:00 |
|
Brian Behlendorf
|
22004be414
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:32 -08:00 |
|
Brian Behlendorf
|
b1534b904a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 13:53:30 -08:00 |
|
Brian Behlendorf
|
1df63bf069
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:26 -08:00 |
|
Brian Behlendorf
|
90eb131b49
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 13:53:25 -08:00 |
|
Brian Behlendorf
|
b87ce8b9b6
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:22 -08:00 |
|
Brian Behlendorf
|
0ee9176942
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 13:53:20 -08:00 |
|
Brian Behlendorf
|
9956c32d10
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:16 -08:00 |
|
Brian Behlendorf
|
a54aa7fa5a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 13:53:14 -08:00 |
|
Brian Behlendorf
|
1dfec71003
|
Add -pthreads
|
2008-12-17 13:51:11 -08:00 |
|
Brian Behlendorf
|
694bb8c7b6
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:44 -08:00 |
|
Brian Behlendorf
|
b355788b7b
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 13:38:43 -08:00 |
|
Brian Behlendorf
|
ba066a4680
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:39 -08:00 |
|
Brian Behlendorf
|
c1e34481d8
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 13:38:38 -08:00 |
|
Brian Behlendorf
|
5450f26f31
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:35 -08:00 |
|
Brian Behlendorf
|
c63b2754b7
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 13:38:33 -08:00 |
|
Brian Behlendorf
|
4086762d99
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:30 -08:00 |
|
Brian Behlendorf
|
0590c2a818
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 13:38:28 -08:00 |
|
Brian Behlendorf
|
39fc234440
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:25 -08:00 |
|
Brian Behlendorf
|
9b2e31eaff
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 13:38:24 -08:00 |
|
Brian Behlendorf
|
02e1565b32
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:21 -08:00 |
|
Brian Behlendorf
|
cd76848d7c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 13:38:19 -08:00 |