Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / class / cdc-acm.h