Brian Behlendorf
|
491c087ad0
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2009-01-05 11:11:42 -08:00 |
|
Brian Behlendorf
|
8044b78627
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2009-01-05 11:11:41 -08:00 |
|
Brian Behlendorf
|
7f66ce2629
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2009-01-05 11:11:40 -08:00 |
|
Brian Behlendorf
|
cad1188061
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2009-01-05 11:11:39 -08:00 |
|
Brian Behlendorf
|
3771daab4b
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2009-01-05 11:11:39 -08:00 |
|
Brian Behlendorf
|
ebe92f0de1
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2009-01-05 11:11:38 -08:00 |
|
Brian Behlendorf
|
2153bb3c2a
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2009-01-05 11:11:38 -08:00 |
|
Brian Behlendorf
|
b7cf57010f
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2009-01-05 11:11:37 -08:00 |
|
Brian Behlendorf
|
266a9cfeb5
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2009-01-05 11:11:36 -08:00 |
|
Brian Behlendorf
|
53656ed26b
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-01-05 11:11:35 -08:00 |
|
Brian Behlendorf
|
94e6346d0c
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2009-01-05 11:11:35 -08:00 |
|
Brian Behlendorf
|
adc6253cbf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-05 11:11:33 -08:00 |
|
Brian Behlendorf
|
c2a2b24e0e
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-05 11:11:32 -08:00 |
|
Brian Behlendorf
|
5db7d5eb99
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
|
2009-01-05 11:11:31 -08:00 |
|
Brian Behlendorf
|
7eaa9d9217
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2009-01-05 11:11:31 -08:00 |
|
Brian Behlendorf
|
2d633df1d1
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-01-05 11:11:30 -08:00 |
|
Brian Behlendorf
|
77333c1833
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2009-01-05 11:11:29 -08:00 |
|
Brian Behlendorf
|
ff0eb51d3c
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-01-05 11:11:28 -08:00 |
|
Brian Behlendorf
|
8b1b0b903a
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2009-01-05 11:11:27 -08:00 |
|
Brian Behlendorf
|
e4fb593953
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2009-01-05 11:11:26 -08:00 |
|
Brian Behlendorf
|
10221edda6
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-01-05 11:11:26 -08:00 |
|
Brian Behlendorf
|
07ad647bad
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2009-01-05 11:11:24 -08:00 |
|
Brian Behlendorf
|
06013fbf2a
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-01-05 11:11:24 -08:00 |
|
Brian Behlendorf
|
bb4f86150c
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2009-01-05 11:11:22 -08:00 |
|
Brian Behlendorf
|
d1410e11bc
|
Remove zdump.c
|
2009-01-05 11:11:21 -08:00 |
|
Brian Behlendorf
|
ef29077f64
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2009-01-05 11:11:09 -08:00 |
|
Brian Behlendorf
|
552f1bb878
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2009-01-05 11:11:09 -08:00 |
|
Brian Behlendorf
|
6b1b73e0a5
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2009-01-05 11:11:08 -08:00 |
|
Brian Behlendorf
|
5cf32b0206
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2009-01-05 11:11:07 -08:00 |
|
Brian Behlendorf
|
1796d8a800
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-01-05 11:11:06 -08:00 |
|
Brian Behlendorf
|
9fd00aa162
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-01-05 11:11:05 -08:00 |
|
Brian Behlendorf
|
148d093b76
|
Remove zdump.c
|
2009-01-05 11:11:02 -08:00 |
|
Brian Behlendorf
|
1ed474aa0d
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-05 11:10:31 -08:00 |
|
Brian Behlendorf
|
36b849fa51
|
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention
|
2009-01-05 11:10:13 -08:00 |
|
Brian Behlendorf
|
4a0b1e550a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 13:50:31 -08:00 |
|
Brian Behlendorf
|
de6b729e33
|
Add Makefile tweak
|
2008-12-23 13:44:15 -08:00 |
|
Brian Behlendorf
|
ad75ceca9b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 13:14:13 -08:00 |
|
Brian Behlendorf
|
e7e0111a7c
|
Update makefile
|
2008-12-23 13:07:27 -08:00 |
|
Brian Behlendorf
|
2b8a76731b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 12:51:45 -08:00 |
|
Brian Behlendorf
|
0dfd5ebee8
|
module/zcommon/Makefile.in
|
2008-12-23 12:47:03 -08:00 |
|
Brian Behlendorf
|
d1e7610b2c
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 11:50:43 -08:00 |
|
Brian Behlendorf
|
5a0a9cc451
|
Update makefiles
|
2008-12-23 11:47:33 -08:00 |
|
Brian Behlendorf
|
e86bf7454b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 11:28:02 -08:00 |
|
Brian Behlendorf
|
8c549cdfd6
|
Add MODDIR directory
|
2008-12-23 11:06:08 -08:00 |
|
Brian Behlendorf
|
34e0918846
|
Resolve conflict
|
2008-12-23 10:18:54 -08:00 |
|
Brian Behlendorf
|
4a8619da5f
|
Add module build targets
|
2008-12-23 10:13:07 -08:00 |
|
Brian Behlendorf
|
2475a871b0
|
Minimal include set
|
2008-12-23 09:42:55 -08:00 |
|
Brian Behlendorf
|
fe119cee57
|
Minor zpios cleanup
|
2008-12-23 09:24:19 -08:00 |
|
Brian Behlendorf
|
fe23f773a7
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 16:58:20 -08:00 |
|
Brian Behlendorf
|
fdffe91056
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 16:55:59 -08:00 |