]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 2 Apr 2015 00:59:01 +0000 (17:59 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 2 Apr 2015 00:59:01 +0000 (17:59 -0700)
commitad9345701a859588f96b12bb8f2435790be05413
treed427887dae14015f9efc9c79d3dc294dcf49f14a
parent895edf726646140ebef910a0f2ba7985f652297a
parent824f25c1ccded5de2d3e18268b91cddccdad3868
Merge branch 'next/soc' into for-next

* next/soc:
  ARM: rockchip: disable watchdog during suspend
  ARM: rockchip: decrease the wait time for resume
  ARM: rockchip: Constify struct regmap_config and staticize local function