Merge branches 'core-fixes-for-linus' and 'timers-fixes-for-linus' of git://git.kerne...