Brian Behlendorf
|
1afc1fdff6
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-10 12:44:48 -08:00 |
|
Brian Behlendorf
|
7a683e0798
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-12-10 12:44:45 -08:00 |
|
Brian Behlendorf
|
c09cf7f5a8
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-10 12:44:44 -08:00 |
|
Brian Behlendorf
|
c054595fa5
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-10 12:44:42 -08:00 |
|
Brian Behlendorf
|
ae3da3aecc
|
Removed file
|
2008-12-10 12:44:40 -08:00 |
|
Brian Behlendorf
|
19921e591e
|
Removed file
|
2008-12-10 12:44:08 -08:00 |
|
Brian Behlendorf
|
1b59a53bf5
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-10 12:43:44 -08:00 |
|
Brian Behlendorf
|
9e8b1e836c
|
Remove libumem, we will try and remove this dependency entirely. If we can't then the best move will simply be to use the official library, or build it as a convenience library
|
2008-12-10 12:43:20 -08:00 |
|
Brian Behlendorf
|
5cb66ff8d5
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-10 12:00:14 -08:00 |
|
Brian Behlendorf
|
deeb049ae2
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-10 12:00:13 -08:00 |
|
Brian Behlendorf
|
e3b2a16cc7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-10 12:00:04 -08:00 |
|
Brian Behlendorf
|
cda625cdfa
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-10 11:59:08 -08:00 |
|
Brian Behlendorf
|
d5c7c0ad86
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-10 11:59:07 -08:00 |
|
Brian Behlendorf
|
279bebaa30
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-10 11:59:04 -08:00 |
|
Brian Behlendorf
|
449999be3f
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-10 11:59:03 -08:00 |
|
Brian Behlendorf
|
97751ff9d5
|
Fix bad cast
|
2008-12-10 11:54:08 -08:00 |
|
Brian Behlendorf
|
6ad960283c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-10 11:32:54 -08:00 |
|
Brian Behlendorf
|
fe0f75b01e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-10 11:32:53 -08:00 |
|
Brian Behlendorf
|
2cc6785050
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-10 11:32:45 -08:00 |
|
Brian Behlendorf
|
486d7cac03
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-10 11:32:09 -08:00 |
|
Brian Behlendorf
|
7baad04134
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-10 11:32:08 -08:00 |
|
Brian Behlendorf
|
c0fd117de8
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-10 11:32:08 -08:00 |
|
Brian Behlendorf
|
b910a84f6e
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-10 11:32:07 -08:00 |
|
Brian Behlendorf
|
6d4310200c
|
Fix two missing voids in prototypes
|
2008-12-10 11:30:12 -08:00 |
|
Brian Behlendorf
|
63b38addd7
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 15:56:31 -08:00 |
|
Brian Behlendorf
|
269bb6aba2
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 15:56:30 -08:00 |
|
Brian Behlendorf
|
560014612d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 15:56:22 -08:00 |
|
Brian Behlendorf
|
40f1eae131
|
Add libspl includes to libumem
|
2008-12-09 15:52:41 -08:00 |
|
Brian Behlendorf
|
48aa829ea0
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 14:56:55 -08:00 |
|
Brian Behlendorf
|
44f4f623ef
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 14:56:54 -08:00 |
|
Brian Behlendorf
|
13835610d7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 14:56:47 -08:00 |
|
Brian Behlendorf
|
6c745cd2c8
|
Update libumem Makefile to reflect new realities
|
2008-12-09 14:54:45 -08:00 |
|
Brian Behlendorf
|
bb5c400bea
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 14:41:48 -08:00 |
|
Brian Behlendorf
|
7a83ce2ade
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 14:41:48 -08:00 |
|
Brian Behlendorf
|
cac45d6fbd
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 14:41:41 -08:00 |
|
Brian Behlendorf
|
28c0e431c0
|
Refer to moved Makefile
|
2008-12-09 14:39:45 -08:00 |
|
Brian Behlendorf
|
88129007d4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 14:26:19 -08:00 |
|
Brian Behlendorf
|
16696784ca
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 14:26:19 -08:00 |
|
Brian Behlendorf
|
68b2db0a48
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 14:26:11 -08:00 |
|
Brian Behlendorf
|
7489df5960
|
Refresh Makefiles for new files
|
2008-12-09 14:23:45 -08:00 |
|
Brian Behlendorf
|
6463b7cb09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 14:17:23 -08:00 |
|
Brian Behlendorf
|
7696aa2463
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 14:17:22 -08:00 |
|
Brian Behlendorf
|
342eb7ef4e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 14:17:15 -08:00 |
|
Brian Behlendorf
|
36d7762781
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-09 14:16:39 -08:00 |
|
Brian Behlendorf
|
19f58048cb
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-09 14:16:39 -08:00 |
|
Brian Behlendorf
|
12dc44dced
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-09 14:16:38 -08:00 |
|
Brian Behlendorf
|
7d897127c1
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-09 14:16:38 -08:00 |
|
Brian Behlendorf
|
da9682b967
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-09 14:16:37 -08:00 |
|
Brian Behlendorf
|
8795b4a264
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-09 14:16:36 -08:00 |
|
Brian Behlendorf
|
0416158844
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-09 14:16:36 -08:00 |