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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 13 Aug 2008 15:22:12 +1000

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
MAINTAINERS between commit 5db80305ad7ea891246aec24204630c2925e7b12
("kmemtrace: Core implementation") from the slab tree and commit
3994d3f08b618f9c40af1d402c3e4ecec946b5dc ("kmemcheck: add Vegard and
Pekka to MAINTAINERS") from the kmemcheck tree.

Simply overlapping additions. I added both.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/