Linux 3.0.37

Conflicts:

	Makefile
	drivers/pci/quirks.c