From: David Brown <davidb@codeaurora.org>
Date: Mon, 17 Jun 2013 20:25:25 +0000 (-0700)
Subject: Merge branch 'msm-clock' into for-next
X-Git-Tag: next-20130619~12^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30c42f29de3a2d567d63a4a4c176dfef1f2a1009;p=karo-tx-linux.git

Merge branch 'msm-clock' into for-next

* msm-clock:
  ARM: msm: Migrate to common clock framework
  ARM: msm: Make proc_comm clock control into a platform driver
  ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
  ARM: msm: Remove clock-7x30.h include file
  ARM: msm: Remove custom clk_set_{max,min}_rate() API
  ARM: msm: Remove custom clk_set_flags() API
  msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
  msm: iommu: Convert to clk_prepare/unprepare
  msm_sdcc: Convert to clk_prepare/unprepare
  usb: otg: msm: Convert to clk_prepare/unprepare
  msm_serial: Use devm_clk_get() and properly return errors
  msm_serial: Convert to clk_prepare/unprepare

Conflicts:
	arch/arm/mach-msm/clock-debug.c
---

30c42f29de3a2d567d63a4a4c176dfef1f2a1009