Linux 3.4.96

Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>

Conflicts:
	arch/arm/kernel/stacktrace.c