Commit Graph

3634 Commits

Author SHA1 Message Date
Brian Behlendorf 5f1d1a4fba Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2010-05-18 15:00:27 -07:00
Brian Behlendorf ff96dfaacf Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2010-05-18 15:00:25 -07:00
Brian Behlendorf 8c341fb8e5 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-05-18 15:00:24 -07:00
Brian Behlendorf 410e9c8755 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2010-05-18 15:00:23 -07:00
Brian Behlendorf a494a8794e Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-05-18 15:00:21 -07:00
Brian Behlendorf e38df7bbe6 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2010-05-18 15:00:20 -07:00
Brian Behlendorf 891e6e3720 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-05-18 15:00:18 -07:00
Brian Behlendorf 83fc7d6c5c Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2010-05-18 15:00:17 -07:00
Brian Behlendorf 5b210a954f Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-05-18 15:00:15 -07:00
Brian Behlendorf e50a0b058f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2010-05-18 15:00:13 -07:00
Brian Behlendorf 3c014d4617 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-05-18 15:00:12 -07:00
Brian Behlendorf 6daf3d3eda Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2010-05-18 15:00:10 -07:00
Brian Behlendorf 6497274bce Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2010-05-18 15:00:09 -07:00
Brian Behlendorf 557e916423 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2010-05-18 15:00:08 -07:00
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 a3125935bf Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-18 14:47:23 -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 a547c8befa Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-18 14:34:20 -07:00
Brian Behlendorf 7861d7e154 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-18 14:33:41 -07:00
Brian Behlendorf 63db2cc5eb Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-18 14:33:40 -07:00
Brian Behlendorf 9e1398d25d Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-18 14:33:39 -07:00
Brian Behlendorf 2b1b4c6878 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-05-18 14:33:38 -07:00
Brian Behlendorf 92b4c4e4cc Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-05-18 14:33:38 -07:00
Brian Behlendorf 18ab1a3634 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-18 14:33:38 -07:00
Brian Behlendorf 4d159b118d Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-05-18 14:33:37 -07:00
Brian Behlendorf 5e840a2f1a Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-05-18 14:33:36 -07:00
Brian Behlendorf 5e882a1a26 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-18 14:33:33 -07:00
Brian Behlendorf 8a6d19b7be Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-18 14:33:32 -07:00
Brian Behlendorf bac43a5ed8 Merge branch 'fix-error-handling' into refs/top-bases/fix-branch 2010-05-18 14:33:32 -07:00
Brian Behlendorf 0c8ffbd097 Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling 2010-05-18 14:33:31 -07:00
Brian Behlendorf 2a15dc5a26 Merge branch 'fix-acl' into refs/top-bases/fix-branch 2010-05-18 14:33:31 -07:00
Brian Behlendorf 6083ba2858 Merge commit 'refs/top-bases/fix-acl' into fix-acl 2010-05-18 14:33:30 -07:00
Brian Behlendorf c1fea7027d Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode 2010-05-18 14:33:29 -07:00
Brian Behlendorf 8d98096d9a Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2010-05-18 14:33:29 -07:00
Brian Behlendorf a0dc4d2b32 Merge commit 'refs/top-bases/fix-strncat' into fix-strncat 2010-05-18 14:33:28 -07:00
Brian Behlendorf ad992ca19f Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2010-05-18 14:33:28 -07:00
Brian Behlendorf 344f6d47a1 Merge commit 'refs/top-bases/fix-list' into fix-list 2010-05-18 14:33:27 -07:00
Brian Behlendorf a818b49bf4 Merge branch 'fix-list' into refs/top-bases/fix-branch 2010-05-18 14:33:27 -07:00
Brian Behlendorf 8a532d2a64 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-05-18 14:33:26 -07:00
Brian Behlendorf e20c20f313 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-05-18 14:33:25 -07:00
Brian Behlendorf 776d7d4aa8 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2010-05-18 14:33:24 -07:00
Brian Behlendorf 4576b667de Merge branch 'fix-stack' into refs/top-bases/fix-branch 2010-05-18 14:33:24 -07:00
Brian Behlendorf 1be176aaef Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2010-05-18 14:33:23 -07:00
Brian Behlendorf 7871483f52 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2010-05-18 14:33:23 -07:00