linux-next: manual merge of the akpm-current tree with Linus' tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/um/kernel/sysrq.c between commit 8ed12fcc194d ("um: Rename
print_stack_trace to do_stack_trace") from Linus' tree and commit
ce89e7878311 ("arch/um/kernel/sysrq.c: rename print_stack_trace()") from
the akpm-current tree.

I fixed it up (I used the version fro, Linus' tree) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpPng6LcvNVo.pgp
Description: PGP signature