]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 6 May 2014 01:46:33 +0000 (18:46 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 6 May 2014 01:46:33 +0000 (18:46 -0700)
* next/soc:
  ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data


Trivial merge