Merge remote-tracking branch 'origin/linux-3.4.y' into v3.4-grsec

Conflicts:
	drivers/xen/xen-pciback/pciback_ops.c