Linux 3.4.1

Conflicts:
	arch/um/include/asm/pgtable.h
	drivers/mmc/core/cd-gpio.c
	drivers/usb/host/xhci.h