Brian Behlendorf
|
e312737766
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:26:18 -08:00 |
|
Brian Behlendorf
|
635d4e5e71
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-19 10:26:17 -08:00 |
|
Brian Behlendorf
|
b66929fe90
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-19 10:26:17 -08:00 |
|
Brian Behlendorf
|
5ee6377759
|
Fix missing void in prototype
|
2008-12-19 10:24:26 -08:00 |
|
Brian Behlendorf
|
ef42192129
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:59 -08:00 |
|
Brian Behlendorf
|
347283843e
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 10:19:58 -08:00 |
|
Brian Behlendorf
|
8e2c4be100
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:54 -08:00 |
|
Brian Behlendorf
|
08ecd85f89
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 10:19:53 -08:00 |
|
Brian Behlendorf
|
076dde0aa7
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:49 -08:00 |
|
Brian Behlendorf
|
97bad1ec2f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 10:19:48 -08:00 |
|
Brian Behlendorf
|
227821c242
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:44 -08:00 |
|
Brian Behlendorf
|
726f45d53d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 10:19:42 -08:00 |
|
Brian Behlendorf
|
570ab8ef24
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:39 -08:00 |
|
Brian Behlendorf
|
23c42b7545
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-19 10:19:37 -08:00 |
|
Brian Behlendorf
|
b1e8a0da39
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:34 -08:00 |
|
Brian Behlendorf
|
bc5f8da7f6
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-19 10:19:32 -08:00 |
|
Brian Behlendorf
|
9eea5684e3
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:29 -08:00 |
|
Brian Behlendorf
|
9b02e8cb72
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 10:19:27 -08:00 |
|
Brian Behlendorf
|
c979d05074
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:24 -08:00 |
|
Brian Behlendorf
|
5f9aa726ff
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 10:19:22 -08:00 |
|
Brian Behlendorf
|
44250851f9
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:19 -08:00 |
|
Brian Behlendorf
|
7ef56c4e1c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:19:17 -08:00 |
|
Brian Behlendorf
|
35f065db51
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:14 -08:00 |
|
Brian Behlendorf
|
1a238799ba
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:19:12 -08:00 |
|
Brian Behlendorf
|
c00e103ca1
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:08 -08:00 |
|
Brian Behlendorf
|
42e7e0b017
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 10:19:07 -08:00 |
|
Brian Behlendorf
|
9b11e0f4dd
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:19:04 -08:00 |
|
Brian Behlendorf
|
b99e44346b
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:19:02 -08:00 |
|
Brian Behlendorf
|
753b745668
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:19:01 -08:00 |
|
Brian Behlendorf
|
c6f1719538
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:18:56 -08:00 |
|
Brian Behlendorf
|
113fbdc5a2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 10:18:54 -08:00 |
|
Brian Behlendorf
|
a577858f33
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:18:53 -08:00 |
|
Brian Behlendorf
|
d0349bbd69
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:18:48 -08:00 |
|
Brian Behlendorf
|
cff15d06fa
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-19 10:18:46 -08:00 |
|
Brian Behlendorf
|
86d0b76bc0
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:18:43 -08:00 |
|
Brian Behlendorf
|
265cb0345b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-19 10:18:41 -08:00 |
|
Brian Behlendorf
|
936c377e4f
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:18:38 -08:00 |
|
Brian Behlendorf
|
41016312ae
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 10:18:36 -08:00 |
|
Brian Behlendorf
|
a6067cac5e
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:18:32 -08:00 |
|
Brian Behlendorf
|
cee42006e5
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-19 10:18:30 -08:00 |
|
Brian Behlendorf
|
c5f98d9c11
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:18:26 -08:00 |
|
Brian Behlendorf
|
15537ec2bd
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 10:18:24 -08:00 |
|
Brian Behlendorf
|
642fcb21a7
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:18:21 -08:00 |
|
Brian Behlendorf
|
ec36f17be6
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-19 10:18:19 -08:00 |
|
Brian Behlendorf
|
143bd1614e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:18:16 -08:00 |
|
Brian Behlendorf
|
8a2224a2af
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-19 10:18:13 -08:00 |
|
Brian Behlendorf
|
9de4108779
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
3e2e5c4535
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
88251643d7
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-19 10:18:11 -08:00 |
|
Brian Behlendorf
|
a68af79057
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-19 10:18:11 -08:00 |