Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / gadget / fsl_mx3_udc.c