summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-04-30 22:16:04 +0900
committerMark Brown <broonie@kernel.org>2017-04-30 22:16:04 +0900
commitccf9fc86d63cbb5c46e96748f1937ce528f49ad2 (patch)
tree03123a9a970ea23a2c6bae4b30f00d0fc5b7b399 /.gitattributes
parent50946b2aecf747e68a50eefa78f1ff9e009a6c0a (diff)
parent56af0e4cd27c402691d0da8aa4a5233944085b44 (diff)
parent7c0c2000716e64151b3c0c62026c18f31537ebe9 (diff)
parent362c59436c143edbcdd4cc2ee0e9856eb6a93bc4 (diff)
parentbabd658503a69c423aeab440f7d385f03ac54f7e (diff)
Merge remote-tracking branches 'asoc/topic/max9878', 'asoc/topic/max98927', 'asoc/topic/mtk' and 'asoc/topic/nau8540' into asoc-next