]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 20:00:08 +0000 (13:00 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 20:00:08 +0000 (13:00 -0700)
commit5bbfebd905b94e4be29aebc9590fd373f9377bfb
tree642e8b870a62fe33e43f6a104a6abf2b7dc03a3c
parent0161b270dbb5f40d045a29e55c0cd891606bde99
parent98954f4b122c2c5ac03bb3d21fd171a062dc294f
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)
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/omap_hwmod_54xx_data.c