Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

path: root/cpp.h

#ifndef CPP_H
#define CPP_H

extern int cpp_exec(char *in_file, char *out_file, size_t out_len);

#endif