Merge git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse into devel
commit5799f59b3810290a38001fe7e2e57f90ec80ff56
authorDan Carpenter <error27@gmail.com>
Mon, 19 Jul 2010 22:10:04 +0000 (20 00:10 +0200)
committerDan Carpenter <error27@gmail.com>
Mon, 19 Jul 2010 22:10:04 +0000 (20 00:10 +0200)
tree29d5a7d1fe501f8b07235d37884a745043bb4f1e
parent3473d99239ca6f0a48867b5ceea1d025c0397c9f
parent73f65f2548a33b08dd6004f68e71734db9c3c4c3
Merge git://git./devel/sparse/chrisl/sparse into devel

Conflicts:
Makefile
parse.c
Makefile
lib.c
pre-process.c
token.h
tokenize.c