Linux 3.0.100

Conflicts:
	drivers/net/wireless/p54/p54usb.c