From: Linus Torvalds Date: Fri, 6 Feb 2015 21:56:02 +0000 (-0800) Subject: Merge branches 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of git://git... X-Git-Tag: v3.19~6 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=26cdd1f76a889a21faa851bcb260782db2c7f0a9;p=linux.git Merge branches 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer and x86 fix from Ingo Molnar: "A CLOCK_TAI early expiry fix and an x86 microcode driver oops fix" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: hrtimer: Fix incorrect tai offset calculation for non high-res timer systems * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, microcode: Return error from driver init code when loader is disabled --- 26cdd1f76a889a21faa851bcb260782db2c7f0a9