Subject: linux-next: manual merge of the kmemcheck tree with the tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 12 Feb 2009 16:38:25 +1100

Hi all,

Today's linux-next merge of the kmemcheck tree got conflicts in
arch/x86/include/asm/pgtable_32.h arch/x86/include/asm/pgtable_64.h
between the unification commits in the x86 tree and commit
5faef0d73631a368f375a5b852e7149f44542670 ("Merge commit 'v2.6.28-rc2'
into kmemcheck") from the kmemcheck tree.

I used the resolution from tip/master.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/