linux-next: manual merge of the kmemcheck tree

Hi Ingo,

Today's linux-next merge of the kmemcheck tree got a conflict in
include/asm-x86/pgtable.h between commit
4226ab93d8ae3fd895abe45879fe34d489a98718 ("x86: use pteval_t for
_PAGE_FOO") from the x86 tree and commit
385e31b9eae0528bada07d16a189f3f40df23961 ("kmemcheck: add the kmemcheck
core") from the kmemcheck tree.

I used the former version except I made the UNUSED3 -> HIDDEN change from
the latter.

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