summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-03 10:50:21 +0200
committerThomas Gleixner <tglx@linutronix.de>2019-07-03 10:50:21 +0200
commit341924049558e5f7c1a148a2c461a417933d35d9 (patch)
tree1340b4f2131737ef4be63f18ee74cd73ad12cd3e /sound/soc/soc-dapm.c
parent516337048fa40496ae5ca9863c367ec991a44d9a (diff)
parent4a8f81b8c053aad250ee247b219904ada72df9a4 (diff)
downloadlinux-stable-341924049558e5f7c1a148a2c461a417933d35d9.tar.gz
linux-stable-341924049558e5f7c1a148a2c461a417933d35d9.tar.bz2
linux-stable-341924049558e5f7c1a148a2c461a417933d35d9.zip
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'sound/soc/soc-dapm.c')
0 files changed, 0 insertions, 0 deletions