Linux 3.0.97

Conflicts:

	arch/powerpc/kernel/align.c