]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 20:51:37 +0000 (13:51 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 20:51:37 +0000 (13:51 -0700)
commit70f3d2c74aa29ec85d52c5feb8cd9fb5c71ab493
tree7fe29aa0d94507ab8d89291f261eb2516960ce42
parentb4b19e59847c5a3583fe42d75aaf93f7de3c8f44
parent50ae4bb946126d1ae52b83446eb125117af9dcd3
Merge branch 'next/soc' into for-next

* next/soc:
  ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
  ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
  ARM: omap-device: add missed callback for suspend-to-disk
  ARM: OMAP2: hwmod: AM43XX: Add hwmod support for HDQ-1W
arch/arm/mach-omap2/omap_hwmod_7xx_data.c