Commit Graph

1466 Commits

Author SHA1 Message Date
Brian Behlendorf
f598f54cc9 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-11-26 14:11:57 -08:00
Brian Behlendorf
063713b02e Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-11-26 14:11:56 -08:00
Brian Behlendorf
315a93d65b Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:55 -08:00
Brian Behlendorf
e93330bdde Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-11-26 14:11:53 -08:00
Brian Behlendorf
a85056eccb Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:49 -08:00
Brian Behlendorf
9ae2f4f2b8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-11-26 14:11:48 -08:00
Brian Behlendorf
2eea7d5a7b Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:44 -08:00
Brian Behlendorf
3c669b6fdc Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-11-26 14:11:43 -08:00
Brian Behlendorf
f1ee2aa266 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:39 -08:00
Brian Behlendorf
342b38d726 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-11-26 14:11:37 -08:00
Brian Behlendorf
c6a033d822 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:33 -08:00
Brian Behlendorf
11c8f58ccf Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-11-26 14:11:32 -08:00
Brian Behlendorf
a5edf031a5 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:28 -08:00
Brian Behlendorf
b054582226 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-11-26 14:11:26 -08:00
Brian Behlendorf
93a977ef63 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:23 -08:00
Brian Behlendorf
e22f88b77d Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-11-26 14:11:21 -08:00
Brian Behlendorf
13f4da3117 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:17 -08:00
Brian Behlendorf
6daee2defd Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-11-26 14:11:15 -08:00
Brian Behlendorf
0d884e20aa Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:11 -08:00
Brian Behlendorf
d4252d6752 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-11-26 14:11:10 -08:00
Brian Behlendorf
64a103c695 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:06 -08:00
Brian Behlendorf
24eec3ec4d Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-11-26 14:11:05 -08:00
Brian Behlendorf
79920477cb Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-11-26 14:11:01 -08:00
Brian Behlendorf
da226074ea Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-11-26 14:11:00 -08:00
Brian Behlendorf
155390b294 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-11-26 14:10:56 -08:00
Brian Behlendorf
8f62ad4dca Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-11-26 14:10:54 -08:00
Brian Behlendorf
553ed929eb Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-11-26 14:10:50 -08:00
Brian Behlendorf
c72edfabfa Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-11-26 14:10:49 -08:00
Brian Behlendorf
0dbdcd6901 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-11-26 14:10:45 -08:00
Brian Behlendorf
26dc97deca Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-11-26 14:10:44 -08:00
Brian Behlendorf
ae07a24451 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-11-26 14:10:40 -08:00
Brian Behlendorf
7f6489a0ad Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-11-26 14:10:38 -08:00
Brian Behlendorf
74e4c75f17 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-11-26 14:10:35 -08:00
Brian Behlendorf
4d3da17bde Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-11-26 14:10:34 -08:00
Brian Behlendorf
c3f7a2e7ce Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-11-26 14:10:33 -08:00
Brian Behlendorf
d9de9d7635 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-11-26 14:10:31 -08:00
Brian Behlendorf
e797de648b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-11-26 14:10:22 -08:00
Brian Behlendorf
63a61abb38 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-11-26 14:10:20 -08:00
Brian Behlendorf
92fddedd5e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-11-26 14:10:19 -08:00
Brian Behlendorf
28419b06c2 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-11-26 14:10:18 -08:00
Brian Behlendorf
9a9675c2a8 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-11-26 14:10:17 -08:00
Brian Behlendorf
c24a62dea7 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2008-11-26 14:10:17 -08:00
Brian Behlendorf
97a6eed121 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-11-26 14:10:15 -08:00
Brian Behlendorf
139128c713 Merge branch 'gcc-no-pragmas' into refs/top-bases/gcc-branch 2008-11-26 14:10:14 -08:00
Brian Behlendorf
45f094ca45 Merge commit 'refs/top-bases/gcc-no-pragmas' into gcc-no-pragmas 2008-11-26 14:10:13 -08:00
Brian Behlendorf
aa7cd26927 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2008-11-26 14:10:10 -08:00
Brian Behlendorf
260e898cec Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-11-26 14:10:09 -08:00
Brian Behlendorf
8063393c41 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-11-26 14:10:07 -08:00
Brian Behlendorf
ced6ff53b4 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-11-26 14:10:06 -08:00
Brian Behlendorf
bfcb67e162 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-11-26 14:10:04 -08:00