Brian Behlendorf
|
f6fae9da07
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-08 16:24:54 -08:00 |
|
Brian Behlendorf
|
ffc6d01e92
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2008-12-08 16:24:52 -08:00 |
|
Brian Behlendorf
|
5410d492e1
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-08 16:24:51 -08:00 |
|
Brian Behlendorf
|
6f2c9f9634
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-12-08 16:24:49 -08:00 |
|
Brian Behlendorf
|
2f826e10c1
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-08 16:24:48 -08:00 |
|
Brian Behlendorf
|
2df3f3637d
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 16:24:45 -08:00 |
|
Brian Behlendorf
|
b1722f7497
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-08 16:24:44 -08:00 |
|
Brian Behlendorf
|
9d7c4e7724
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-08 16:24:43 -08:00 |
|
Brian Behlendorf
|
c48ec3a6f4
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2008-12-08 16:24:42 -08:00 |
|
Brian Behlendorf
|
b2e17ad4a2
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-12-08 16:24:39 -08:00 |
|
Brian Behlendorf
|
e18b9f63b5
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-08 16:24:38 -08:00 |
|
Brian Behlendorf
|
1438e02e87
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-12-08 16:24:36 -08:00 |
|
Brian Behlendorf
|
2cceb0adbf
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2008-12-08 16:24:34 -08:00 |
|
Brian Behlendorf
|
9117e0a5f6
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-12-08 16:24:32 -08:00 |
|
Brian Behlendorf
|
cecc7ecb16
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-08 16:24:31 -08:00 |
|
Brian Behlendorf
|
86b8de6114
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-08 16:24:28 -08:00 |
|
Brian Behlendorf
|
9389cd1802
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-08 16:24:27 -08:00 |
|
Brian Behlendorf
|
ed91e53b20
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-12-08 16:24:25 -08:00 |
|
Brian Behlendorf
|
4e45893afa
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-08 16:24:24 -08:00 |
|
Brian Behlendorf
|
cd5bdf50cc
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-12-08 16:24:21 -08:00 |
|
Brian Behlendorf
|
0c71f3446c
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-08 16:24:20 -08:00 |
|
Brian Behlendorf
|
d8d4322039
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-08 16:24:18 -08:00 |
|
Brian Behlendorf
|
fbcf47642b
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-08 16:24:17 -08:00 |
|
Brian Behlendorf
|
4e0eae9138
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-08 16:24:14 -08:00 |
|
Brian Behlendorf
|
d86369e5c6
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-08 16:24:13 -08:00 |
|
Brian Behlendorf
|
2b67f51fb6
|
Attempt move of kernel.c with topgit
|
2008-12-08 16:20:25 -08:00 |
|
Brian Behlendorf
|
619a29ce08
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 15:34:29 -08:00 |
|
Brian Behlendorf
|
912f4f1e1d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 15:33:31 -08:00 |
|
Brian Behlendorf
|
a5b90e4746
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 15:33:31 -08:00 |
|
Brian Behlendorf
|
5c0eea852f
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-08 15:33:30 -08:00 |
|
Brian Behlendorf
|
bb55a4f104
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-08 15:33:30 -08:00 |
|
Brian Behlendorf
|
7b4a040002
|
Correct missing void in prototype
|
2008-12-08 15:31:41 -08:00 |
|
Brian Behlendorf
|
4f9297ebca
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 13:51:17 -08:00 |
|
Brian Behlendorf
|
93b07767fb
|
Add missing libspl/zu.c stub
|
2008-12-08 13:48:38 -08:00 |
|
Brian Behlendorf
|
d9bdf333ed
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 11:29:10 -08:00 |
|
Brian Behlendorf
|
5d31b4febd
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 11:28:15 -08:00 |
|
Brian Behlendorf
|
e60cd17a6a
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 11:28:14 -08:00 |
|
Brian Behlendorf
|
68708f6114
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-08 11:28:14 -08:00 |
|
Brian Behlendorf
|
94b08b3b91
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-08 11:28:13 -08:00 |
|
Brian Behlendorf
|
7c6de8b41c
|
Add missing cast
|
2008-12-08 10:32:55 -08:00 |
|
Brian Behlendorf
|
8ea44c46a1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 10:20:55 -08:00 |
|
Brian Behlendorf
|
85f71237d9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 10:20:01 -08:00 |
|
Brian Behlendorf
|
35c322451f
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 10:20:00 -08:00 |
|
Brian Behlendorf
|
4c7ed56833
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-08 10:20:00 -08:00 |
|
Brian Behlendorf
|
5cf55d35dd
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-08 10:20:00 -08:00 |
|
Brian Behlendorf
|
fd39fc67d0
|
Fix invalid %llf format by dropping useless ll prefix
|
2008-12-08 10:18:11 -08:00 |
|
Brian Behlendorf
|
63a8a5ca44
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 10:12:53 -08:00 |
|
Brian Behlendorf
|
c6b3007cbe
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 10:11:59 -08:00 |
|
Brian Behlendorf
|
17c6f97565
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 10:11:58 -08:00 |
|
Brian Behlendorf
|
b5908e07c0
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-08 10:11:58 -08:00 |