summaryrefslogtreecommitdiffstats
path: root/include/sound/es1688.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-07-26 09:26:29 +0200
committerDave Airlie <airlied@redhat.com>2016-07-26 09:26:29 +0200
commit5e580523d9128a4d8364fe89d36c38fc7819c8dd (patch)
tree852fb2427d980830ae8686a91e4ca5873f259ab9 /include/sound/es1688.h
parentMerge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm... (diff)
parentLinux 4.7 (diff)
downloadlinux-5e580523d9128a4d8364fe89d36c38fc7819c8dd.tar.xz
linux-5e580523d9128a4d8364fe89d36c38fc7819c8dd.zip
Backmerge tag 'v4.7' into drm-next
Linux 4.7 As requested by Daniel Vetter as the conflicts were getting messy.
Diffstat (limited to 'include/sound/es1688.h')
0 files changed, 0 insertions, 0 deletions