summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-05 21:26:45 +0900
committerMark Brown <broonie@kernel.org>2016-03-05 21:26:45 +0900
commit3b22371e202d2c2f48bb4192879cf611e91a97be (patch)
tree8142bcc2c6aba8698a5b1fe0a83a4361e1b03863 /include/trace
parent92e9f77306e3dddb707ae744333ea204c9727bac (diff)
parentf4833a519aec793cf8349bf479589d37473ef6a7 (diff)
parent9af39044753d7280fa795528598636fe9c58a54e (diff)
parent58c0213872816bf24d14364989c82dc4acd58103 (diff)
parentf4d438eec7fe56d55998195e08dfaa5aa3e08f0c (diff)
parent419396d5a1d12003a18a58785687697800d2f02a (diff)
parenta947b724069a25eae86d8dfed905374d04c3f93c (diff)
downloadlinux-3b22371e202d2c2f48bb4192879cf611e91a97be.tar.bz2
Merge remote-tracking branches 'asoc/fix/jack', 'asoc/fix/max98088', 'asoc/fix/max98095', 'asoc/fix/omap', 'asoc/fix/pxa' and 'asoc/fix/qcom-be' into asoc-linus