Linux 3.0.47

Conflicts:

	Makefile
	drivers/usb/class/cdc-acm.c