Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / net / caif / Makefile
2010-03-31 Sjur Braendelandnet-caif: add CAIF Kconfig and Makefiles