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 |
Brian Behlendorf
|
7005de9a0c
|
Refresh Makefile.am's
|
2008-12-12 09:20:33 -08:00 |
Brian Behlendorf
|
20e4845d0f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 08:52:50 -08:00 |
Brian Behlendorf
|
87b4b8b8b7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 08:52:49 -08:00 |
Brian Behlendorf
|
86b3bb18c3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 08:52:43 -08:00 |
Brian Behlendorf
|
d4ae03c700
|
Add initial stub makefile, details need filling in
|
2008-12-12 08:50:07 -08:00 |
Brian Behlendorf
|
d2c1da93ba
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 16:56:10 -08:00 |
Brian Behlendorf
|
d1298845df
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 16:56:08 -08:00 |
Brian Behlendorf
|
9ddda584c8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 16:55:55 -08:00 |
Brian Behlendorf
|
f55d6ad125
|
Remove bugus checks for now
|
2008-12-11 16:51:09 -08:00 |
Brian Behlendorf
|
531ffc59df
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 16:34:15 -08:00 |
Brian Behlendorf
|
5332504adb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 16:34:13 -08:00 |
Brian Behlendorf
|
c95fabb9c7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 16:33:58 -08:00 |
Brian Behlendorf
|
a0e625a878
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-11 15:41:52 -08:00 |
Brian Behlendorf
|
e4fae8e3d4
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-11 15:41:52 -08:00 |
Brian Behlendorf
|
eefa9ab3ab
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-11 15:41:51 -08:00 |
Brian Behlendorf
|
12389cbaaf
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-11 15:41:51 -08:00 |
Brian Behlendorf
|
2308a268a5
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-11 15:41:51 -08:00 |
Brian Behlendorf
|
843ecec587
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-11 15:41:50 -08:00 |
Brian Behlendorf
|
a557668285
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-11 15:41:49 -08:00 |
Brian Behlendorf
|
9e0b8ff76f
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-11 15:41:48 -08:00 |
Brian Behlendorf
|
182754d11a
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 15:41:48 -08:00 |
Brian Behlendorf
|
a442f70b33
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-11 15:41:47 -08:00 |
Brian Behlendorf
|
c41f16e355
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:47 -08:00 |
Brian Behlendorf
|
66b04c1abb
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2008-12-11 15:41:46 -08:00 |
Brian Behlendorf
|
bb92f42dba
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:45 -08:00 |
Brian Behlendorf
|
d35a0f25fe
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-11 15:41:45 -08:00 |
Brian Behlendorf
|
63d6795628
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:43 -08:00 |
Brian Behlendorf
|
dd32efe6ef
|
Resolve conflict
|
2008-12-11 15:41:42 -08:00 |
Brian Behlendorf
|
8070a7f894
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:30 -08:00 |
Brian Behlendorf
|
b8224d752e
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-11 15:41:29 -08:00 |
Brian Behlendorf
|
dfe1ee52a1
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:28 -08:00 |
Brian Behlendorf
|
7e85cefdc5
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-11 15:41:28 -08:00 |
Brian Behlendorf
|
41826aa79d
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:27 -08:00 |
Brian Behlendorf
|
09eaa95e85
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-11 15:41:26 -08:00 |
Brian Behlendorf
|
11f488d4e0
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:25 -08:00 |
Brian Behlendorf
|
d93a4f894a
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-11 15:41:25 -08:00 |
Brian Behlendorf
|
e6e6a6025f
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:24 -08:00 |
Brian Behlendorf
|
d8ab98ca3c
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-11 15:41:23 -08:00 |
Brian Behlendorf
|
464b4185d0
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-11 15:40:42 -08:00 |