Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jan 2014 00:28:49 +0000 (07:28 +0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jan 2014 00:28:49 +0000 (07:28 +0700)
commit061f49ec2d722f485237870f04544d8bec15a778
tree6e83c153c84c319c101cb6d19bcd0b6d00eea683
parent7e22e91102c6b9df7c4ae2168910e19d2bb14cd6
parent26bef1318adc1b3a530ecc807ef99346db2aa8b0
Merge branch 'x86/urgent' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Peter Anvin:
 "Sorry, meant to push out this batch earlier this weekend"

* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, fpu, amd: Clear exceptions in AMD FXSAVE workaround
  ftrace/x86: Load ftrace_ops in parameter not the variable holding it