Merge tag 'v3.12.22' into v3.12-rt

This is the 3.12.22 stable release

Conflicts:
	kernel/irq/manage.c