Merge commit 'efc9194bcff84' ("ASoC: hdmi-codec: callback function will be called...
authorRussell King <rmk+kernel@armlinux.org.uk>
Wed, 7 Sep 2016 12:08:48 +0000 (13:08 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Wed, 7 Sep 2016 12:08:48 +0000 (13:08 +0100)
commit3ef500a53f8c44ca82decf79dd8138fd07c7739d
tree638dfd47f6e016fbc0102d0aa0a3ce90f642ac6b
parent523d939ef98fd712632d93a5a2b588e477a7565e
parentefc9194bcff84666832c6493bafa92029ac6634c
Merge commit 'efc9194bcff84' ("ASoC: hdmi-codec: callback function will be called with private data") into drm-tda998x-devel

This commit is required for the TDA998x ASoC support, so to avoid build
errors, merge this commit into this branch prior to commiting Jiri's
patches.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>