Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas...

* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (234 commits)
  ARM: shmobile: remove additional __io() macro use
  ARM: mach-shmobile: default to no earlytimer
  ARM: mach-shmobile: r8a7779 and Marzen timer rework
  ARM: mach-shmobile: r8a7740 and Bonito timer rework
  ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework
  ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework
  ARM: mach-shmobile: sh7377 and G4EVM timer rework
  ARM: mach-shmobile: sh7367 and G3EVM timer rework
  ARM: mach-shmobile: add shmobile_earlytimer_init()
  ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup
  ARM: mach-shmobile: Move sh7372 Mackerel external clk setup
  ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()
  ARM: mach-shmobile: r8a7779 L2 cache support
  ARM: mach-shmobile: r8a7779 map_io and init_early update
  ARM: mach-shmobile: r8a7740 map_io and init_early update
  ARM: mach-shmobile: sh73a0 map_io and init_early update
  ARM: mach-shmobile: sh7372 map_io and init_early update
  ARM: mach-shmobile: sh7377 map_io and init_early update
  ARM: mach-shmobile: sh7367 map_io and init_early update
  sh: remove clk_ops
  ...

  (includes an update to v3.3-rc7)

Conflicts:
	arch/arm/mach-omap2/id.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/id.c
index 92e4d5558b1ea0af1bfd41785f5543f5c1419ac4,719ee423abe22be6439cb4b3dd0ce78dcecb41b5..c199b173a59c1d6690b82c48c65820152967af92
--- 1/arch/arm/mach-omap2/id.c
--- 2/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@@ -395,7 -342,8 +395,8 @@@ void __init omap3xxx_check_revision(voi
                break;
        case 0xb944:
                omap_revision = AM335X_REV_ES1_0;
 -              *cpu_rev = "1.0";
 +              cpu_rev = "1.0";
+               break;
        case 0xb8f2:
                switch (rev) {
                case 0:

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

diff --cc drivers/mmc/host/mmci.c
Simple merge