| commit | 02c8d855191d1bcfc663310be965a406d713e7cf | |
| author | Dan Carpenter <error27@gmail.com> | |
| Mon, 7 Dec 2009 14:40:09 +0000 (7 16:40 +0200) | ||
| committer | Dan Carpenter <error27@gmail.com> | |
| Mon, 7 Dec 2009 14:40:09 +0000 (7 16:40 +0200) | ||
| tree | 8f2d1b4c644531c695b8ae538e0d0335310e99ab | treesnapshot (tar.gz zip) |
| parent | 433c3bdea4215a3d6be91c56d895b4a1bf69c959 | commitdiff |
| parent | 77bbff33ec5e653e794c4fd495c8062204f6e022 | commitdiff |
Merge branch 'master' of /home/dcarpenter/progs/sparse/chris/sparse
Conflicts:
.gitignore
Makefile
This is a merge of Christopher Li's tree. It's the first time I've used
git merge in real life, so we'll see if anything went wrong.
It brings in a lot of changes. I probably should pull out all the
smatch stuff into a local.mk. Also ARRAY_SIZE() is now defined in a git
header so I removed it from smatch.h
Signed-off-by: Dan Carpenter <error27@gmail.com>
Conflicts:
.gitignore
Makefile
This is a merge of Christopher Li's tree. It's the first time I've used
git merge in real life, so we'll see if anything went wrong.
It brings in a lot of changes. I probably should pull out all the
smatch stuff into a local.mk. Also ARRAY_SIZE() is now defined in a git
header so I removed it from smatch.h
Signed-off-by: Dan Carpenter <error27@gmail.com>
| .gitignore | diff1 | diff2 | blobhistory |
| Makefile | diff1 | diff2 | blobhistory |
| smatch.h | diff1 | blobhistory |