Brian Behlendorf
|
2ce583f663
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2008-12-08 16:24:55 -08:00 |
|
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
|
bffeaec6c1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:37:50 -08:00 |
|
Brian Behlendorf
|
b4207042da
|
Add a few more missing headers
|
2008-12-08 15:36:08 -08:00 |
|
Brian Behlendorf
|
a62f51b079
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:50 -08:00 |
|
Brian Behlendorf
|
7b32749fba
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-08 15:34:49 -08:00 |
|
Brian Behlendorf
|
b830b278fe
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-08 15:34:45 -08:00 |
|
Brian Behlendorf
|
20972fcde8
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:45 -08:00 |
|
Brian Behlendorf
|
956e6d28cd
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:42 -08:00 |
|
Brian Behlendorf
|
a16904cfd9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-08 15:34:41 -08:00 |
|
Brian Behlendorf
|
b63cb700b0
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:38 -08:00 |
|
Brian Behlendorf
|
4f0034a816
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-08 15:34:37 -08:00 |
|
Brian Behlendorf
|
76419ed49e
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:34 -08:00 |
|
Brian Behlendorf
|
9169e8d111
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-08 15:34:33 -08:00 |
|
Brian Behlendorf
|
811bc9e192
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:30 -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
|
4aca00c752
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:26 -08:00 |
|
Brian Behlendorf
|
c0b2421b22
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 15:34:25 -08:00 |
|
Brian Behlendorf
|
c8444f6b13
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:22 -08:00 |
|
Brian Behlendorf
|
2907c498fb
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-08 15:34:21 -08:00 |
|
Brian Behlendorf
|
6f094d9b7b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:17 -08:00 |
|
Brian Behlendorf
|
4b72f60cbb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-08 15:34:16 -08:00 |
|
Brian Behlendorf
|
b36784f7ba
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-08 15:34:13 -08:00 |
|
Brian Behlendorf
|
223192ae38
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:13 -08:00 |
|
Brian Behlendorf
|
7891024a3f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-08 15:34:10 -08:00 |