summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-03 10:40:00 +0100
committerMark Brown <broonie@linaro.org>2014-06-03 10:40:00 +0100
commita2fbbbf10d7a11a949c32625e7088ad46f3c4bbc (patch)
treed3fc75f7e4bf983ce7a45dc283dfab1ffaa11142
parent325394434f4e581291e086c30b7be2e76a96d1ae (diff)
parent06109f47f2c33fdd2b10194ee53235e72b8fbfe7 (diff)
parenta7f0b839cb5cb50d6ca5a567930ae039ed83cb2a (diff)
Merge remote-tracking branches 'asoc/topic/wm8804' and 'asoc/topic/wm9713' into asoc-next