summaryrefslogtreecommitdiff
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-18 11:55:50 +0000
committerMark Brown <broonie@kernel.org>2018-01-18 11:55:50 +0000
commit6ec2c85f676c2bf687f332c2bbc71f225e79b74f (patch)
tree221678d3586b8c48a1324f54e99673cec46ee5c6 /drivers/platform/x86
parentb0714c5d98fa722beda17a6af9045ee7ded57286 (diff)
parentba8dd49f9431497c6b13514cfab3065b01057247 (diff)
parent3c89724e994f4aee6ae2637ccd4e12aa4f92666c (diff)
parent8080699a3649cb0a0aed2c650a7a3a76c2025b30 (diff)
parent392b79e20b41cfdc174d31bd4b004bbd874de4d9 (diff)
parent4855f6a6283fc8ea1f79c9f49c91940afef64ef6 (diff)
Merge remote-tracking branches 'asoc/topic/cs47l24', 'asoc/topic/cx20442', 'asoc/topic/da7213', 'asoc/topic/da7218' and 'asoc/topic/dai-drv' into asoc-next