summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-15 15:05:34 -0700
committerMark Brown <broonie@kernel.org>2014-09-15 15:05:34 -0700
commitf7667af21736eb231e3589d9f91183d325cabfbe (patch)
tree3bfeab749a84ac77b53d9e00ff4cec81e98c2a7e
parentaf0f2ceadf87fc277afe1456f3c3fe3e69750aee (diff)
parent774418253e0ec226ad220c6237bba80fd3f4fbc0 (diff)
parentfe0a29e163a5d045c73faab682a8dac71c2f8012 (diff)
parentd67f660edbce696f3fc6bc8c25b869f5a72279bb (diff)
parent133c2681c4a0c1b589d138c2fdd0f131bdce20ed (diff)
parent03be88ee4ab3acceddca43f11f4d01bcd6edcb93 (diff)
Merge remote-tracking branches 'asoc/fix/cs4265', 'asoc/fix/davinci', 'asoc/fix/rockchip', 'asoc/fix/samsung' and 'asoc/fix/tlv320aic31xx' into asoc-linus