Merge branch 'asoc-5.15' into asoc-5.16

Browse source

...

This commit is contained in:

Mark Brown 2021-10-21 14:41:32 +01:00

parent 4304150553 5ba8ecf227

commit 324081ab79

No known key found for this signature in database

GPG key ID: 24D68B725D5487D0

4 changed files with 3 additions and 60 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

sound/soc/rockchip/Makefile

View file

3

sound/soc/rockchip/rockchip_i2s.c

View file

44

sound/soc/rockchip/rockchip_pcm.c

View file

11

sound/soc/rockchip/rockchip_pcm.h

View file