Linux 3.0.96

Conflicts:

	arch/m32r/boot/compressed/Makefile
	arch/m32r/boot/compressed/misc.c