Commit Graph

10876 Commits

Author SHA1 Message Date
Brian Behlendorf a2b17c5744 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-18 16:39:57 -08:00
Brian Behlendorf d6ca5f4b22 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-02-18 16:39:49 -08:00
Brian Behlendorf 283b744e89 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-02-18 16:39:45 -08:00
Brian Behlendorf 5026284b48 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-02-18 16:39:36 -08:00
Brian Behlendorf 68816d820e Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-02-18 16:39:31 -08:00
Brian Behlendorf c301f6309a Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-02-18 16:39:21 -08:00
Brian Behlendorf d09c4a4c80 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-02-18 16:39:18 -08:00
Brian Behlendorf 6bf6f62d98 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-02-18 16:39:09 -08:00
Brian Behlendorf aab28d7a6e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-18 16:39:06 -08:00
Brian Behlendorf 7fb9b38b35 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-02-18 16:38:57 -08:00
Brian Behlendorf a21e67a4af Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-02-18 16:38:54 -08:00
Brian Behlendorf e5950641e2 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-02-18 16:38:42 -08:00
Brian Behlendorf 359141b50e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-02-18 16:38:40 -08:00
Brian Behlendorf cdbb12e5c5 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-02-18 16:38:31 -08:00
Brian Behlendorf a983057c58 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 16:38:28 -08:00
Brian Behlendorf eac636b639 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-02-18 16:38:19 -08:00
Brian Behlendorf 2cbe1d0785 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-02-18 16:38:16 -08:00
Brian Behlendorf fab643a25b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-02-18 16:38:15 -08:00
Brian Behlendorf 5957fa4c9c Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-02-18 16:37:59 -08:00
Brian Behlendorf ac79872526 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-02-18 16:37:56 -08:00
Brian Behlendorf 87245deaab Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 16:37:54 -08:00
Brian Behlendorf 7cc355671b Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-02-18 16:37:38 -08:00
Brian Behlendorf a922810637 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-02-18 16:37:35 -08:00
Brian Behlendorf d7f98447e7 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-02-18 16:37:26 -08:00
Brian Behlendorf 986174d1e0 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-02-18 16:37:22 -08:00
Brian Behlendorf 9ec4c5282a Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-02-18 16:37:13 -08:00
Brian Behlendorf 4b53631e65 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-02-18 16:37:10 -08:00
Brian Behlendorf 57b14e008e Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-02-18 16:37:01 -08:00
Brian Behlendorf 7e7d1134be Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-02-18 16:36:57 -08:00
Brian Behlendorf 9c7ef97372 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-02-18 16:36:49 -08:00
Brian Behlendorf a8edc189e5 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-02-18 16:36:45 -08:00
Brian Behlendorf ffebd4eaa3 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-02-18 16:36:37 -08:00
Brian Behlendorf ce17ae9e94 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-02-18 16:36:34 -08:00
Brian Behlendorf 04f4045077 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-18 16:36:25 -08:00
Brian Behlendorf e898182f62 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-18 16:36:21 -08:00
Brian Behlendorf b57a283336 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 16:36:19 -08:00
Brian Behlendorf d53b9a34ea Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 16:36:17 -08:00
Brian Behlendorf e6c50e7136 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-02-18 16:36:16 -08:00
Brian Behlendorf 5c3b1a45fb Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-02-18 16:36:16 -08:00
Brian Behlendorf a0ef7f5826 C90 fixes int declared in for() is a C99 construct 2009-02-18 16:30:01 -08:00
Brian Behlendorf beef42a45d Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-02-18 16:25:01 -08:00
Brian Behlendorf 5afd28c5ac Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-02-18 16:24:55 -08:00
Brian Behlendorf 1a0d839cd4 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-02-18 16:24:47 -08:00
Brian Behlendorf 9f2e9c5a87 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-02-18 16:24:45 -08:00
Brian Behlendorf 41a98747dd Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-02-18 16:24:36 -08:00
Brian Behlendorf c14e759c7c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-02-18 16:24:32 -08:00
Brian Behlendorf 8be12ac4cb Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-02-18 16:24:19 -08:00
Brian Behlendorf ec90316e19 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-02-18 16:24:17 -08:00
Brian Behlendorf d56a0a8dbd Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-18 16:24:08 -08:00
Brian Behlendorf ccdc0e2d04 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-18 16:24:06 -08:00