aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown2016-07-24 22:07:40 +0100
committerMark Brown2016-07-24 22:07:40 +0100
commitf3413783e48f0a5b4cc7795cbf66f084eb739821 (patch)
treeda8abf564daf70d8d5488033215267346ada32bd
parentc704f4e31210b76a7236e90847f9e989383be926 (diff)
parent65aca64d05b5eaa5ce15e18b458a8d338ddbd478 (diff)
parent53ae918f117dbb86e7b872e3b7532839f752c895 (diff)
parent46dd2e28a90e48fbf1b7e253933fa3b7242e9b1b (diff)
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/rcar' and 'asoc/topic/rockchip' into asoc-next