Merge git://git.infradead.org/~dhowells/irq-2.6