Commit Graph

9748 Commits

Author SHA1 Message Date
Brian Behlendorf 4162fdc0d8 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:32 -08:00
Brian Behlendorf 20942db96a Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-15 15:30:31 -08:00
Brian Behlendorf cd7eabc421 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:27 -08:00
Brian Behlendorf 50881047b6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 15:30:25 -08:00
Brian Behlendorf 205087bdac Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:22 -08:00
Brian Behlendorf 461fe17e5f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 15:30:20 -08:00
Brian Behlendorf 15a865fdaa Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:17 -08:00
Brian Behlendorf 14caea82a9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 15:30:15 -08:00
Brian Behlendorf 9b04c3108d Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:11 -08:00
Brian Behlendorf 1724a1dd37 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 15:30:10 -08:00
Brian Behlendorf 8f2e12e852 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-15 15:30:06 -08:00
Brian Behlendorf 865347e0be Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 15:30:05 -08:00
Brian Behlendorf 702ba8cdf7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 15:30:04 -08:00
Brian Behlendorf 9fdb33a17b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:58 -08:00
Brian Behlendorf 930ef960bc Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-15 15:29:56 -08:00
Brian Behlendorf 9c8802c7e4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 15:29:55 -08:00
Brian Behlendorf 4f7748bbca Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:49 -08:00
Brian Behlendorf 1f4b4284c9 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 15:29:47 -08:00
Brian Behlendorf 2e206eeda9 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:44 -08:00
Brian Behlendorf 0e6512ce55 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-15 15:29:42 -08:00
Brian Behlendorf ee4f8bfe5f Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:39 -08:00
Brian Behlendorf be961a3054 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-15 15:29:37 -08:00
Brian Behlendorf ffbdeb3592 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:33 -08:00
Brian Behlendorf e1bdcbf61a Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-15 15:29:32 -08:00
Brian Behlendorf 7b0f19a1f7 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:28 -08:00
Brian Behlendorf 498140c4cb Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-15 15:29:26 -08:00
Brian Behlendorf f333fc8b87 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:23 -08:00
Brian Behlendorf a893c13b1e Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-15 15:29:21 -08:00
Brian Behlendorf 15cd579536 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:18 -08:00
Brian Behlendorf 2e84c7ae79 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 15:29:16 -08:00
Brian Behlendorf 8511545409 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:29:15 -08:00
Brian Behlendorf fa36244fba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:29:14 -08:00
Brian Behlendorf 4cb119f61f Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-15 15:29:14 -08:00
Brian Behlendorf 4c0be07ad9 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:29:13 -08:00
Brian Behlendorf 22284754e0 Resolve C90 int declared in for() construct 2009-01-15 15:26:54 -08:00
Brian Behlendorf 0c8b8291c0 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-01-15 14:54:04 -08:00
Brian Behlendorf 27ade2c137 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-15 14:54:02 -08:00
Brian Behlendorf c00654b4cb Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-15 14:53:59 -08:00
Brian Behlendorf d2150abea0 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 14:53:57 -08:00
Brian Behlendorf b8a1e81c22 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-15 14:53:53 -08:00
Brian Behlendorf 87136c6509 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-15 14:53:51 -08:00
Brian Behlendorf ce96d02d89 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-15 14:53:48 -08:00
Brian Behlendorf d2e898f56e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-15 14:53:47 -08:00
Brian Behlendorf 868ba1411f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-15 14:53:43 -08:00
Brian Behlendorf b8709a7d90 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 14:53:41 -08:00
Brian Behlendorf 2dee9e8fb2 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-15 14:53:37 -08:00
Brian Behlendorf 1d99976e28 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 14:53:35 -08:00
Brian Behlendorf 0e6cec9b67 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-15 14:53:32 -08:00
Brian Behlendorf e08af41a62 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-15 14:53:30 -08:00
Brian Behlendorf e3a89ef71e Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-15 14:53:26 -08:00