Merge remote-tracking branch 'origin/linux-3.10.y' into linux-3.10.y-grsec

Conflicts:
	arch/x86/kernel/setup.c
	ipc/shm.c