linux-next: manual merge of the arm-soc tree with the tip tree

From: Stephen Rothwell
Date: Thu Jun 20 2013 - 03:10:16 EST

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-integrator/integrator_ap.c between commit 38ff87f77af0
("sched_clock: Make ARM's sched_clock generic for all architectures")
from the tip tree and commit 01ef31053ddd ("ARM: integrator: move VGA
base assignment") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-integrator/integrator_ap.c
index aa43462,a5b15c4..0000000
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@@ -41,8 -41,6 +41,7 @@@
#include <linux/stat.h>
#include <linux/sys_soc.h>
#include <linux/termios.h>
+#include <linux/sched_clock.h>
- #include <video/vga.h>

#include <mach/hardware.h>
#include <mach/platform.h>

Attachment: pgp00000.pgp
Description: PGP signature