| commit | 5eb831f6db94fd62b3c3401841ef21885781e0a3 | |
| author | Dan Carpenter <dan.carpenter@oracle.com> | |
| Tue, 27 Feb 2018 20:34:03 +0000 (27 23:34 +0300) | ||
| committer | Dan Carpenter <dan.carpenter@oracle.com> | |
| Thu, 1 Mar 2018 10:31:27 +0000 (1 13:31 +0300) | ||
| tree | 89011981b72b66a13c0ce8d9a9c007cae8e6cacc | treesnapshot (tar.gz zip) |
| parent | 173ef76114e3bec10847b9a3ad8acaf5d3efad2b | commitdiff |
| parent | 9fff86b30747be0a081632269f5aaf6e17bed4a9 | commitdiff |
Merge git://git./devel/sparse/sparse into devel
Every time I merge, I get a ton of conflicts because I merged the wrong
stuff in 2013. Hopefully, this will clean most of the issues up and bring
me back in line with upstream Sparse.
# Conflicts:
# .gitignore
# Makefile
# cgcc
# char.c
# ident-list.h
# lib.c
# parse.c
# ptrlist.h
# symbol.c
# token.h
# validation/enum-mismatch.c
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Every time I merge, I get a ton of conflicts because I merged the wrong
stuff in 2013. Hopefully, this will clean most of the issues up and bring
me back in line with upstream Sparse.
# Conflicts:
# .gitignore
# Makefile
# cgcc
# char.c
# ident-list.h
# lib.c
# parse.c
# ptrlist.h
# symbol.c
# token.h
# validation/enum-mismatch.c
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
18 files changed: