Merge branches 'locking-urgent-for-linus' and 'timers-urgent-for-linus' of git:/...