summaryrefslogtreecommitdiff
path: root/kernel/trace/ftrace.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 14:13:15 +0300
committerMark Brown <broonie@kernel.org>2017-09-01 14:13:15 +0300
commit6f78e0a1b2c96e0567122f0f679b2d327105c070 (patch)
tree5f2940f4c08a866f5a729cb1dfd9072322bad463 /kernel/trace/ftrace.c
parent644cbda501ee409aeef091e0cbf693aa15ecf878 (diff)
parentcfe267da9de756d15eab095358b0b122c57816a6 (diff)
parent5144468efb076b1859477de19257dd7ec9c24ed3 (diff)
parentc9f3d3441311792a0beb410af74e1aad4c3f715d (diff)
parentc996b52df44b83d227d7664d2838ed1c6739c850 (diff)
parentc0d088f04f115409287003b5fc0dfd3184d7d306 (diff)
downloadlinux-6f78e0a1b2c96e0567122f0f679b2d327105c070.tar.xz
Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/txx9', 'asoc/topic/utils', 'asoc/topic/ux500' and 'asoc/topic/wm8523' into asoc-next