linux-next: manual merge of the akpm tree with the tip tree
From: Stephen Rothwell
Date: Tue Mar 27 2012 - 00:57:29 EST
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/kernel/process_64.c between commit 90e240142bd3 ("x86: Merge the
x86_32 and x86_64 cpu_idle() functions") from the tip tree and commit
54d16004d978 ("x86: use this_cpu_xxx to replace percpu_xxx funcs") from
the akpm tree.
The former moved the code to another file, so I did this change from the
latter (in enter_idle) to arch/x86/kernel/process.c.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature