From: Olof Johansson <olof@lixom.net>
Date: Mon, 26 May 2014 20:00:08 +0000 (-0700)
Subject: Merge branch 'next/soc' into for-next
X-Git-Tag: next-20140530~119^2~30
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5bbfebd905b94e4be29aebc9590fd373f9377bfb;p=karo-tx-linux.git

Merge branch 'next/soc' into for-next

* next/soc:
  ARM: DRA752: add detection of SoC information
  ARM: OMAP2+: Remove suspend_set_ops from common pm late init
  ARM: OMAP2+: hwmod: OMAP5 DSS hwmod data
  ARM: omap4: hwmod_data: Clean up audio related structures (remove/merge them)
---

5bbfebd905b94e4be29aebc9590fd373f9377bfb