Linux 3.0.60

Conflicts:

	arch/powerpc/platforms/embedded6xx/wii.c
	arch/s390/include/asm/timex.h
	arch/s390/kernel/time.c
	arch/s390/kvm/interrupt.c
	arch/sh/include/asm/elf.h