From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Jan 2014 00:28:49 +0000 (+0700)
Subject: Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Tag: next-20140116~132
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=061f49ec2d722f485237870f04544d8bec15a778;p=karo-tx-linux.git

Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/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
---

061f49ec2d722f485237870f04544d8bec15a778