Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / linux / caif /
2010-04-28 Sjur Braendelandcaif: Rewritten socket implementation
2010-03-31 Sjur Braendelandnet-caif: add CAIF socket and configuration headers