Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...