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