From: Olof Johansson Date: Tue, 6 May 2014 01:46:33 +0000 (-0700) Subject: Merge branch 'next/soc' into for-next X-Git-Tag: next-20140516~111^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4be6791b43db8fa108c031cf2be8d30204cf6d17;p=karo-tx-linux.git Merge branch 'next/soc' into for-next * next/soc: ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data --- 4be6791b43db8fa108c031cf2be8d30204cf6d17