aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown2017-02-19 16:36:54 +0000
committerMark Brown2017-02-19 16:36:54 +0000
commit166729f37da174f4ad967ebfc3e6f1517d247e61 (patch)
tree69a99cb02389600d9ded68fda153e2f6eb1d60f2
parenta564394660a0d7c6b5423b5d41ae6d0a2fd21191 (diff)
parentc7f87f96e384b7ecc41a6c0c8c397e095284ede0 (diff)
parentdf3b5733496f7c375fcb200a5a82b7d89d75cfd1 (diff)
parent9c1852b459f04f6309e40d1d167512b0a5598529 (diff)
parente984fd61e860ce3c45e79d69cf214b8cc6cae7d9 (diff)
parentc97c4604c008f3d489cc3201de80e313aeb501d6 (diff)
Merge remote-tracking branches 'asoc/topic/rt5665', 'asoc/topic/rt5677', 'asoc/topic/samsung', 'asoc/topic/simple' and 'asoc/topic/sunxi' into asoc-next