linux-next: manual merge of the kmemcheck tree

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/kernel/traps_64.c between commit
badc76527f7e29302f0bde3d366c59101fb2ab87 ("x86: traps_xx: shuffle headers
and globals") from the x86 tree and commit
862849a36e6087faac6349de0b1bcc66ff98411b ("x86: add hooks for kmemcheck
on x86_64") from the kmemcheck tree.

Just overlapping shuffling and adding of include files.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/