Linux 3.0.68

Conflicts:

	Makefile
	arch/s390/kvm/kvm-s390.c
	drivers/dca/dca-core.c