linux-next: manual merge of the kmemcheck tree
From: Stephen Rothwell <hidden>
Date: 2008-08-13 05:26:10
Hi all,
Today's linux-next merge of the kmemcheck tree got a trivial conflict in
mm/Makefile between commit 5db80305ad7ea891246aec24204630c2925e7b12
("kmemtrace: Core implementation") from the slab tree and commit
e6df1035b1b488cafde1e69f1a25f2706c3ac1f7 ("kmemcheck: add mm functions")
from the kmemcheck tree.
The latter removed an empty line that the former replaced.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 197 bytes