Commit Graph

5794 Commits

Author SHA1 Message Date
Brian Behlendorf b3e6fc2c24 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 10:36:29 -08:00
Brian Behlendorf b5039d2e57 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 10:36:27 -08:00
Brian Behlendorf 29c3af38e1 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-22 10:36:24 -08:00
Brian Behlendorf f7d9583ab8 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-22 10:36:23 -08:00
Brian Behlendorf 90cd990731 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-22 10:36:20 -08:00
Brian Behlendorf 7db566250e Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-22 10:36:18 -08:00
Brian Behlendorf 9c47372b96 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 10:36:15 -08:00
Brian Behlendorf cb4b423572 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-22 10:36:13 -08:00
Brian Behlendorf 5f0a629790 Add enable_extended_FILE_stdio #define 2008-12-22 10:34:22 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -08:00
Brian Behlendorf b120822fdd Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:52 -08:00
Brian Behlendorf 0e44aed872 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 10:24:50 -08:00
Brian Behlendorf 10364eab16 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:47 -08:00
Brian Behlendorf 7ac1e43fdf Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 10:24:46 -08:00
Brian Behlendorf 251bbe1acd Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:42 -08:00
Brian Behlendorf 00371ba18c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 10:24:41 -08:00
Brian Behlendorf 4eeb9dd691 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:38 -08:00
Brian Behlendorf 124da899c2 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 10:24:36 -08:00
Brian Behlendorf 2e7140a4bd Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:33 -08:00
Brian Behlendorf 01734c0d7f Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-22 10:24:32 -08:00
Brian Behlendorf 35a1cd6d56 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:29 -08:00
Brian Behlendorf 372c7d1868 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 10:24:27 -08:00
Brian Behlendorf d8b0b02651 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:24 -08:00
Brian Behlendorf 74ab6c06d1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 10:24:23 -08:00
Brian Behlendorf 2bd4be8f63 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:19 -08:00
Brian Behlendorf feb1bbc1b3 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 10:24:18 -08:00
Brian Behlendorf e65061106f Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:15 -08:00
Brian Behlendorf 7debf8e578 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 10:24:13 -08:00
Brian Behlendorf 95fb316416 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:10 -08:00
Brian Behlendorf 61a794cec7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 10:24:09 -08:00
Brian Behlendorf ce0ef71d6c Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:05 -08:00
Brian Behlendorf 0e2cb59efb Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 10:24:04 -08:00
Brian Behlendorf fff105fd2a Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-22 10:24:01 -08:00
Brian Behlendorf c8a3446319 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 10:24:00 -08:00
Brian Behlendorf 6cf672e90d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 10:23:59 -08:00
Brian Behlendorf 8ad4cbeac0 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 10:23:54 -08:00
Brian Behlendorf 2277922795 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 10:23:52 -08:00
Brian Behlendorf 25afaa1e57 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 10:23:52 -08:00
Brian Behlendorf 9e6c7a32ce Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-22 10:23:46 -08:00
Brian Behlendorf d7057fc4ab Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-22 10:23:45 -08:00
Brian Behlendorf 0b63e9b3b1 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-22 10:23:42 -08:00
Brian Behlendorf d0b24760c5 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 10:23:40 -08:00
Brian Behlendorf 6480ac4c47 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-22 10:23:37 -08:00
Brian Behlendorf 8264ba977b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 10:23:35 -08:00
Brian Behlendorf a074ac7e99 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 10:23:32 -08:00
Brian Behlendorf 2fed020153 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 10:23:31 -08:00
Brian Behlendorf f78526d37e Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-22 10:23:28 -08:00
Brian Behlendorf 181222687e Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-22 10:23:26 -08:00
Brian Behlendorf c66de6fa75 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-22 10:23:23 -08:00
Brian Behlendorf 3261cb91a9 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-22 10:23:21 -08:00