Commit Graph

18667 Commits

Author SHA1 Message Date
Brian Behlendorf ab1c7c0446 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2010-05-18 15:00:06 -07:00
Brian Behlendorf bbb77ca198 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2010-05-18 15:00:04 -07:00
Brian Behlendorf 8ef9226d8f Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2010-05-18 15:00:02 -07:00
Brian Behlendorf e9ffbaf18d Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2010-05-18 15:00:00 -07:00
Brian Behlendorf 71eb2bb283 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-05-18 14:59:58 -07:00
Brian Behlendorf 0e43115a17 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-05-18 14:59:57 -07:00
Brian Behlendorf 6119cb885a Add AUTHORS to master branch 2010-05-18 14:55:01 -07:00
Brian Behlendorf d07dde4627 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-18 14:48:59 -07:00
Brian Behlendorf 0f9cee5942 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-18 14:48:57 -07:00
Brian Behlendorf 3b9d118253 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-18 14:48:57 -07:00
Brian Behlendorf 52e55fbdde Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-18 14:48:42 -07:00
Brian Behlendorf 8581eb7b39 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-18 14:48:40 -07:00
Brian Behlendorf b76d6d2c62 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-05-18 14:48:32 -07:00
Brian Behlendorf cb880a26e4 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-18 14:48:30 -07:00
Brian Behlendorf b63b6ef114 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-05-18 14:48:23 -07:00
Brian Behlendorf 5a9210d0ab Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-05-18 14:48:21 -07:00
Brian Behlendorf d589a55518 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-05-18 14:48:13 -07:00
Brian Behlendorf 18042a75f2 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-05-18 14:48:11 -07:00
Brian Behlendorf e71ffd8d0e Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-05-18 14:48:03 -07:00
Brian Behlendorf 4c62fcab06 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-05-18 14:48:02 -07:00
Brian Behlendorf b9727be1b8 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-18 14:47:54 -07:00
Brian Behlendorf a0fbfc09b3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-05-18 14:47:53 -07:00
Brian Behlendorf a64c4d036f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-18 14:47:45 -07:00
Brian Behlendorf 6038b63cba Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-18 14:47:43 -07:00
Brian Behlendorf 9f12c9ee3d Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-05-18 14:47:35 -07:00
Brian Behlendorf 948680b012 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-18 14:47:33 -07:00
Brian Behlendorf 108a05035d Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-05-18 14:47:25 -07:00
Brian Behlendorf a3125935bf Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-18 14:47:23 -07:00
Brian Behlendorf 246150f786 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-18 14:47:16 -07:00
Brian Behlendorf 5c86a9a089 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-18 14:47:14 -07:00
Brian Behlendorf 6f36370e92 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-18 14:47:06 -07:00
Brian Behlendorf a3e5fc6a3b Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-18 14:47:04 -07:00
Brian Behlendorf 64a9f434f4 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-05-18 14:46:56 -07:00
Brian Behlendorf f20fd4c00e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-18 14:46:54 -07:00
Brian Behlendorf bcc5de8c52 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-18 14:46:46 -07:00
Brian Behlendorf 6bf8be4107 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-05-18 14:46:45 -07:00
Brian Behlendorf ebac557883 Revert accidental change to COPYING, move authors to master branch. 2010-05-18 14:41:47 -07:00
Brian Behlendorf be4cfe7409 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-18 14:35:56 -07:00
Brian Behlendorf b47b5e68d9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-18 14:35:54 -07:00
Brian Behlendorf a2e9c56a90 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-18 14:35:53 -07:00
Brian Behlendorf 59ee80ce54 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-18 14:35:39 -07:00
Brian Behlendorf 2db5b6c7d3 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-18 14:35:37 -07:00
Brian Behlendorf a77467df19 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-05-18 14:35:29 -07:00
Brian Behlendorf 400f621711 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-18 14:35:27 -07:00
Brian Behlendorf f04f3903f0 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-05-18 14:35:20 -07:00
Brian Behlendorf 4510e333eb Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-05-18 14:35:18 -07:00
Brian Behlendorf 8115c420a2 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-05-18 14:35:10 -07:00
Brian Behlendorf cfd40ff10b Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-05-18 14:35:08 -07:00
Brian Behlendorf 0e44bfff23 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-05-18 14:35:00 -07:00
Brian Behlendorf 3fa1ce1416 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-05-18 14:34:59 -07:00