Merge remote-tracking branch 'upstream/nspire' into testing

Conflicts:
	arch/arm/mach-nspire/nspire_cx.c