Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c