| commit | 1f23dab27cbed56f03cae2341c841b86075f12e7 | |
| author | H. Peter Anvin <hpa@zytor.com> | |
| Sun, 4 Mar 2012 19:42:36 +0000 (4 11:42 -0800) | ||
| committer | H. Peter Anvin <hpa@zytor.com> | |
| Sun, 4 Mar 2012 19:42:41 +0000 (4 11:42 -0800) | ||
| tree | 9f43f626290295595f6231de38bb0c8250b61166 | treesnapshot (tar.gz zip) |
| parent | 500ddabcd35f18421fc36dda945adcb212b595a3 | commitdiff |
| parent | 65ff09a9d8159f36b135de98b03f288fda95b1a0 | commitdiff |
Merge branch 'master' into new-preproc
This is a dummy merge to allow us to do backmerges from the
master branch without git trying to redo the backport of the
old preprocessor on us.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This is a dummy merge to allow us to do backmerges from the
master branch without git trying to redo the backport of the
old preprocessor on us.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>