62c14ca4ca
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-05-18 14:32:46 -07:00
9a8060d6f5
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-05-18 14:32:45 -07:00
91fce49b3b
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-05-18 14:32:43 -07:00
d16fe106c2
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-05-18 14:32:41 -07:00
4d145474b3
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-05-18 14:32:39 -07:00
ca357527f5
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-05-18 14:32:38 -07:00
86b3826fdd
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-05-18 14:32:37 -07:00
2ce4f1a664
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-05-18 14:32:35 -07:00
7f2abf3598
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-05-18 14:32:34 -07:00
720315c047
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-05-18 14:32:32 -07:00
5a6dfc1799
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-05-18 14:32:30 -07:00
888c4e84da
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-05-18 14:32:28 -07:00
2a60b16620
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-05-18 14:32:27 -07:00
f7f7cdbfee
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-05-18 14:32:25 -07:00
fa94cf43b9
Update COPYRIGHT to reference zpios CDDL exceptions.
2010-05-18 14:25:28 -07:00
c98946e318
Add missing CDDL headers.
2010-05-18 13:38:06 -07:00
2a80af91ed
Remove nvpair_alloc_system.c change in libspl topic branch.
...
A change to the nvpair implementation should not have been made in
the libspl-topic branch. This patch fixes that accident by reverting
the change and providing the missing libspl header to allow the
proper building of nvpair_alloc_system.c without the need to modify it.
2010-05-18 12:47:08 -07:00
a1dcfdc8ec
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-18 12:32:20 -07:00
13ad721a84
Move user-arch.m4 change from linux-libspl to zfs-branch.
2010-05-18 12:26:48 -07:00
794f62f6f7
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-18 11:15:33 -07:00
d115e15d29
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-18 11:14:06 -07:00
c88a793e82
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-18 11:14:05 -07:00
a52727cf3e
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-05-18 11:14:04 -07:00
78d56178f7
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-18 11:14:04 -07:00
de49a76d60
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-05-18 11:14:03 -07:00
2b170bc4aa
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-05-18 11:14:03 -07:00
eb262352b9
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-05-18 11:14:02 -07:00
972604b9de
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-05-18 11:14:01 -07:00
b900615c23
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-18 11:13:59 -07:00
df96a3b0af
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-18 11:13:58 -07:00
071c859042
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-05-18 11:13:57 -07:00
99e37fab4d
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-05-18 11:13:57 -07:00
bb49d90ec7
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-05-18 11:13:56 -07:00
2bc6d6fc45
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-05-18 11:13:56 -07:00
34aabc8309
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-05-18 11:13:55 -07:00
7096dd4914
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-05-18 11:13:54 -07:00
4aec1b2c69
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-05-18 11:13:54 -07:00
e8b390e859
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-05-18 11:13:53 -07:00
f09781f3f8
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-05-18 11:13:52 -07:00
0a4dc624e1
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-05-18 11:13:52 -07:00
ad02550d1a
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-05-18 11:13:51 -07:00
fa769a9f38
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-05-18 11:13:50 -07:00
4da95d62db
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-05-18 11:13:49 -07:00
1f12fcbd5f
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-05-18 11:13:49 -07:00
9e5c771d80
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-05-18 11:13:48 -07:00
c9d613e12e
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-05-18 11:13:47 -07:00
4faedb35e3
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-05-18 11:13:46 -07:00
32ef72e3a7
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-05-18 11:13:45 -07:00
8201e8130a
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-05-18 11:13:44 -07:00
b513d368ae
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-05-18 11:13:44 -07:00
Brian Behlendorf