summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-12 23:05:31 +0000
committerMark Brown <broonie@linaro.org>2014-03-12 23:05:31 +0000
commitdeeed33850c8a376addabbf971df433b2a1ba74c (patch)
treef0c1da260b47d14ba838485b9c4cc042414b78e6 /include/trace
parent139f4b836b075abfd79199e727312f7766e0347c (diff)
parentb7c1b73097b48a7922d1320d5a8c8315ff4fae71 (diff)
parentaedbfd9649c5a9ee8e601f8f35e74ea617371ae5 (diff)
parent09981dcb77eba05974eed4def32931fb12421fae (diff)
downloadlinux-deeed33850c8a376addabbf971df433b2a1ba74c.tar.bz2
Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/wm9081' and 'asoc/topic/wm9705' into asoc-next