Linux 3.0.34

Conflicts:

	Makefile
	drivers/bluetooth/btusb.c