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
|
7fd3f6d8b9
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
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
|
16ad896509
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-12 13:46:20 -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
|
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
|
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
|
ea3adc331a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 12:14:52 -08:00 |
|
Brian Behlendorf
|
ac9f5a5af0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 12:13:43 -08:00 |
|
Brian Behlendorf
|
0f99484285
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-12 12:13:41 -08:00 |
|
Brian Behlendorf
|
e1db87107d
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-12 12:13:40 -08:00 |
|
Brian Behlendorf
|
95f0795156
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-12 12:13:39 -08:00 |
|
Brian Behlendorf
|
ea6e9380e7
|
Add void to prototype
|
2008-12-12 11:12:11 -08:00 |
|
Brian Behlendorf
|
a46fb06d3f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 11:07:07 -08:00 |
|
Brian Behlendorf
|
88de88c1b9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 11:07:07 -08:00 |
|
Brian Behlendorf
|
1cb6a4e6e7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 11:06:59 -08:00 |
|
Brian Behlendorf
|
ded433714f
|
Refine Makefiles
|
2008-12-12 11:04:44 -08:00 |
|
Brian Behlendorf
|
8166d4835a
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:59:26 -08:00 |
|
Brian Behlendorf
|
fbb5c2ca7c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:59:26 -08:00 |
|
Brian Behlendorf
|
4d54aed828
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:59:19 -08:00 |
|
Brian Behlendorf
|
9fbc572a59
|
Refine Makefiles
|
2008-12-12 10:57:05 -08:00 |
|
Brian Behlendorf
|
ad8923316f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:44:56 -08:00 |
|
Brian Behlendorf
|
d26d53fafc
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:44:55 -08:00 |
|
Brian Behlendorf
|
3b0ebda451
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:44:49 -08:00 |
|
Brian Behlendorf
|
d7ec1ed532
|
Refine Makefiles
|
2008-12-12 10:43:39 -08:00 |
|
Brian Behlendorf
|
07f84cad28
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:38:11 -08:00 |
|
Brian Behlendorf
|
1cce2945a5
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:38:10 -08:00 |
|
Brian Behlendorf
|
7eb016ef42
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:38:04 -08:00 |
|
Brian Behlendorf
|
76e1c54125
|
Refine Makefiles
|
2008-12-12 10:36:14 -08:00 |
|
Brian Behlendorf
|
d1b07069fa
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:29:57 -08:00 |
|
Brian Behlendorf
|
3fa572fe20
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:29:56 -08:00 |
|
Brian Behlendorf
|
409daa686f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:29:50 -08:00 |
|
Brian Behlendorf
|
f429331a49
|
Remove redundant build options
|
2008-12-12 10:27:10 -08:00 |
|
Brian Behlendorf
|
9d9a72e422
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:18:20 -08:00 |
|
Brian Behlendorf
|
a25da53921
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:18:19 -08:00 |
|
Brian Behlendorf
|
796cb52da5
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:18:13 -08:00 |
|
Brian Behlendorf
|
2d5777f9a7
|
Use AM_CFLAGS
|
2008-12-12 10:15:59 -08:00 |
|
Brian Behlendorf
|
6280a6f17b
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 10:12:39 -08:00 |
|
Brian Behlendorf
|
d4bd8c42a5
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 10:12:38 -08:00 |
|
Brian Behlendorf
|
4846b5850f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:12:32 -08:00 |
|
Brian Behlendorf
|
6d78e69193
|
Add missing include patch
|
2008-12-12 10:10:16 -08:00 |
|
Brian Behlendorf
|
29d5998baf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 09:22:55 -08:00 |
|
Brian Behlendorf
|
f2dc02c87c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 09:22:55 -08:00 |
|
Brian Behlendorf
|
8516e2d45e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 09:22:48 -08:00 |