Linux 3.4.12

Conflicts:

	arch/alpha/include/asm/atomic.h
	arch/arm/Makefile
	arch/arm/kernel/traps.c
	arch/mips/mm/gup.c
	arch/s390/oprofile/init.c
	drivers/hid/hid-logitech-dj.c
	drivers/mmc/card/block.c
	drivers/net/usb/asix.c
	drivers/usb/host/xhci-hub.c
	drivers/usb/host/xhci.c
	mm/vmscan.c

Conflicts:

	drivers/usb/host/xhci-hub.c
	drivers/usb/host/xhci.c