summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-23 08:44:14 +0900
committerMark Brown <broonie@kernel.org>2015-10-23 08:44:14 +0900
commitf69eccc4b248ce53b1b830034babd0a795d5763c (patch)
tree9dde41c4d2a09071ddf0ea9019e6988904072063 /include
parentab5cf7df4578e46f6587c589f0c4d58c7c9a8753 (diff)
parentf8f2dc4a7127725383c93b501fcc4e47871b0a9d (diff)
parent34198710f55b5f359f43e67d9a08fe5aadfbca1b (diff)
parent97aff2c03a1e4d343266adadb52313613efb027f (diff)
parent4eb0f7abcefad2d4c127aa7502d3122635eddab0 (diff)
Merge remote-tracking branches 'asoc/fix/rt298', 'asoc/fix/sx', 'asoc/fix/wm8904' and 'asoc/fix/wm8962' into asoc-linus