Brian Behlendorf
|
49cfe7da4a
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:31 -08:00 |
|
Brian Behlendorf
|
dfbea5673a
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-12 13:46:30 -08:00 |
|
Brian Behlendorf
|
e198681a5c
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:29 -08:00 |
|
Brian Behlendorf
|
8ffbf21ee6
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2008-12-12 13:46:29 -08:00 |
|
Brian Behlendorf
|
0ee2e37b8d
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:27 -08:00 |
|
Brian Behlendorf
|
9d5295298d
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-12 13:46:27 -08:00 |
|
Brian Behlendorf
|
7fd3f6d8b9
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:25 -08:00 |
|
Brian Behlendorf
|
4b741e6dd5
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-12 13:46:25 -08:00 |
|
Brian Behlendorf
|
295cf87bbd
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:24 -08:00 |
|
Brian Behlendorf
|
d941b8ec9c
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-12 13:46:23 -08:00 |
|
Brian Behlendorf
|
bdb0f362c3
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:22 -08:00 |
|
Brian Behlendorf
|
b00eb5c285
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-12 13:46:22 -08:00 |
|
Brian Behlendorf
|
ad4ff5d2f5
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:20 -08:00 |
|
Brian Behlendorf
|
16ad896509
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-12 13:46:20 -08:00 |
|
Brian Behlendorf
|
6bd1d4e45c
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-12 13:46:19 -08:00 |
|
Brian Behlendorf
|
7c63b600b1
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-12 13:46:18 -08:00 |
|
Brian Behlendorf
|
810db7e0a2
|
Remove zcommon reference merged in to zpool
|
2008-12-12 13:41:20 -08:00 |
|
Brian Behlendorf
|
058cbf020f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 13:40:15 -08:00 |
|
Brian Behlendorf
|
de9d49a2b4
|
Minor mutex tweaks
|
2008-12-12 13:38:13 -08:00 |
|
Brian Behlendorf
|
ba611ca42d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:57:18 -08:00 |
|
Brian Behlendorf
|
b127f72a15
|
Resolve mutex conflict
|
2008-12-12 12:55:33 -08:00 |
|
Brian Behlendorf
|
ab95bc7c7b
|
Add missing ;
|
2008-12-12 12:21:58 -08:00 |
|
Brian Behlendorf
|
9d0fe1b6d9
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:43 -08:00 |
|
Brian Behlendorf
|
1ff495a2cc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 12:16:41 -08:00 |
|
Brian Behlendorf
|
f7ff3bb3d9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:33 -08:00 |
|
Brian Behlendorf
|
2705a25010
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 12:16:30 -08:00 |
|
Brian Behlendorf
|
95a654d33c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:23 -08:00 |
|
Brian Behlendorf
|
f3edbceddc
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 12:16:20 -08:00 |
|
Brian Behlendorf
|
0f67ff3295
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:13 -08:00 |
|
Brian Behlendorf
|
5cfa6836f7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 12:16:10 -08:00 |
|
Brian Behlendorf
|
3b4ae3bef7
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:03 -08:00 |
|
Brian Behlendorf
|
d3066c085a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 12:16:00 -08:00 |
|
Brian Behlendorf
|
99e02a01a5
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:53 -08:00 |
|
Brian Behlendorf
|
be42a7683a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 12:15:50 -08:00 |
|
Brian Behlendorf
|
98f29fc963
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:43 -08:00 |
|
Brian Behlendorf
|
8136621404
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 12:15:41 -08:00 |
|
Brian Behlendorf
|
5dd837202a
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:34 -08:00 |
|
Brian Behlendorf
|
3c0f20229e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 12:15:31 -08:00 |
|
Brian Behlendorf
|
48a78f0957
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:26 -08:00 |
|
Brian Behlendorf
|
bcfa4f4d53
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 12:15:24 -08:00 |
|
Brian Behlendorf
|
49d8efa13b
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:18 -08:00 |
|
Brian Behlendorf
|
4344da1fa3
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 12:15:16 -08:00 |
|
Brian Behlendorf
|
bb23271675
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:15:10 -08:00 |
|
Brian Behlendorf
|
4a3b280b22
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 12:15:08 -08:00 |
|
Brian Behlendorf
|
cc67d6a03e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 12:15:06 -08:00 |
|
Brian Behlendorf
|
7bf7d028a7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:14:57 -08:00 |
|
Brian Behlendorf
|
4df31a796e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 12:14:54 -08:00 |
|
Brian Behlendorf
|
ea3adc331a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 12:14:52 -08:00 |
|
Brian Behlendorf
|
aa69bfc29c
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:14:41 -08:00 |
|
Brian Behlendorf
|
4d9dd57c96
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 12:14:39 -08:00 |