Merge branch 'topic-0620/samsung-pm-3.4' into chromeos-exynos-3.4

Merge branch 'topic-0620/samsung-pm-3.4' into chromeos-exynos-3.4

* topic-0620/samsung-pm-3.4: (32 commits)
  CHROMIUM: exynos: pwm: Cosmetic tidy of PWM variable names
  CHROMIUM: exynos: Stop the PWM timer while configuring it.
  CHROMIUM: exynos: Ensure the manual update bit is off before setting it.
  exynos5: cpufreq: updated asv voltage table for cpufreq
  exynos: daisy: Add support for controlling the 32KHz peripheral clock
  trivial: regulator: Fix indentation in MAX77686
  ARM: exynos: Add thermal sensor driver platform data support
  thermal: exynos: Register the tmu sensor with the kernel thermal layer
  thermal: exynos5: Add exynos5 thermal sensor driver support
  hwmon: exynos4: Move thermal sensor driver to driver/thermal directory
  thermal: Add generic cpufreq cooling implementation
  ARM: EXYNOS5: Fix i2c suspend/resume issue
  ARM: Add missing clock definition
  ARM: EXYNOS: Add WDT reset register definitions
  regulator: Support for PMIC-MAX77686.
  mfd: Add suport for MAX77686.
  i2c: exynos: Add fix for i2c suspend/resume
  ARM: EXYNOS: Select ARM_CPU_SUSPEND & S5P_SLEEP if CPU_IDLE enabled
  UPSTREAM: cpufreq: exynos: Show list of available frequencies
  UPSTREAM: arm: exynos: Adapt to cpuidle core time keeping and irq enable
  ...

Conflicts:
	arch/arm/mach-exynos/include/mach/regs-pmu.h

Change-Id: I1d871adc49be46453f87e6f4487a1711065fc2f1