From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 9 Apr 2013 11:09:02 +0000 (+0200)
Subject: Merge tag 'davinci-for-v3.10/soc' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ac5ac893b21715cb6355303654b81625782d9cbf;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'davinci-for-v3.10/soc' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/soc

From Sekhar Nori <nsekhar@ti.com>:

v3.10 SoC updates for DaVinci

a) adds support for eHRPWM clocks
b) Fix the way MMC/SD IP versions are communicated to driver
   in preparation for DT support
c) Minor cleanup in debug-macro.S

* tag 'davinci-for-v3.10/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: remove test for undefined Kconfig macro
  ARM: davinci: mmc: derive version information from device name
  ARM: davinci: da850: add ECAP & EHRPWM clock nodes
  ARM: davinci: clk framework support for enable/disable functionality

Includes an update to Linux 3.9-rc5

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

ac5ac893b21715cb6355303654b81625782d9cbf