linux-next: manual merge of the tegra tree with the arm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/common.c between commit daa14d5e60e0 ("ARM:
mach-tegra: properly disable CPU idle call") from the arm tree and commit
65fe31da5ced ("ARM: tegra: support for Tegra30 CPU powerdomains") from
the tegra tree.

Just context changes.  I fixed it up (see below) and can carry the fax as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-tegra/common.c
index 2db20da,09dc37fc..0000000
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -27,6 -27,8 +27,7 @@@
  #include <asm/hardware/gic.h>
  
  #include <mach/iomap.h>
 -#include <mach/system.h>
+ #include <mach/powergate.h>
  
  #include "board.h"
  #include "clock.h"

Attachment: pgp00000.pgp
Description: PGP signature