linux-next: manual merge of the generic-ipi tree

From: Stephen Rothwell <hidden>
Date: 2008-07-03 06:44:19

Hi Ingo, Jens,

Today's linux-next merge of the generic-ipi tree got a conflict in
init/main.c between commit 385e31b9eae0528bada07d16a189f3f40df23961
("kmemcheck: add the kmemcheck core") from the kmemcheck tree and commit
3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1 ("Add generic helpers for arch
IPI function calls") from the generic-ipi tree.

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

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help