Merge git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse into devel
commitf5fade6d11e321f872c1e11b22c4e53900b988cc
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 3 Oct 2014 11:20:13 +0000 (3 14:20 +0300)
committerDan Carpenter <dan.carpenter@oracle.com>
Fri, 3 Oct 2014 11:20:13 +0000 (3 14:20 +0300)
treeb50e557483bc5e57a30bca90241d23ae1387dc51
parentadadec054ec3018be101b184ee01dfd0ef5e8e76
parent4d8811879a1cc48c1cdd0b0466dc6865c715d149
Merge git://git./devel/sparse/chrisl/sparse into devel

Conflicts:
lib.c
scope.c

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Makefile
evaluate.c
expression.h
ident-list.h
lib.c
lib.h
parse.c
scope.c
scope.h
sparse.c
symbol.c