summaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-04-30 22:15:55 +0900
committerMark Brown <broonie@kernel.org>2017-04-30 22:15:55 +0900
commit0f57c12ab467494f66c9d616358703ae8a5098d6 (patch)
tree5e85a65201e176a136e79a50c734d3894acf5cc6 /kernel/power
parent99dd3c53f6a0350f17234baff728144cc981a8b7 (diff)
parent59c15fcd7b8f3e85baba167a3b7c0cbc692ebd90 (diff)
parent404785f9eff34086a3f67a9b5cefe6495d7b0a4a (diff)
parent5ace37bd7947e28dec5559a57ddc6e1d997dbec5 (diff)
parent24dbd9edb668e2376ce871199f5ee4fd59c62276 (diff)
parentf2a3ee01259ef33ffe4caa0875afe25c15938a14 (diff)
Merge remote-tracking branches 'asoc/topic/es7134', 'asoc/topic/es8328', 'asoc/topic/fsl', 'asoc/topic/fsl-asrc' and 'asoc/topic/fsl-esai' into asoc-next