linux-next: manual merge of the x86 tree

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/lib/Makefile between commit
81d68a96a39844853b37f20cc8282d9b65b78ef3 ("ftrace: trace irq disabled
critical timings") from the ftrace tree and a couple of commits from the
x86 tree.

Just an overlapping addition (from the former) with changes (from the
latter).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/