summaryrefslogtreecommitdiffstats
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2018-06-05 11:03:27 +0200
committerRussell King <rmk+kernel@armlinux.org.uk>2018-06-05 11:03:27 +0200
commit0ac000e86703dedea1000513dbb8a64d02930668 (patch)
treec21658c704c9dcdcb2dc18863ab60312885a6b90 /sound/soc/rockchip
parentARM: fix kill( ,SIGFPE) breakage (diff)
parentARM: 8774/1: remove no-op macro VMLINUX_SYMBOL() (diff)
parentARM: spectre-v1: fix syscall entry (diff)
downloadlinux-0ac000e86703dedea1000513dbb8a64d02930668.tar.xz
linux-0ac000e86703dedea1000513dbb8a64d02930668.zip
Merge branches 'fixes', 'misc' and 'spectre' into for-linus