summaryrefslogtreecommitdiffstats
path: root/include/sound/asound.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-07 17:59:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-07 17:59:07 -0700
commitc1a567d31b5488f4593eae7ca215264947b355ca (patch)
tree347b8226a2e92676dc2618d8109b99aa275aa31e /include/sound/asound.h
parent14b596c9d80bf63da3f0fcbddfd67eb62197afb4 (diff)
parentcd3de83f147601356395b57a8673e9c5ff1e59d1 (diff)
downloadlinux-c1a567d31b5488f4593eae7ca215264947b355ca.tar.gz
linux-c1a567d31b5488f4593eae7ca215264947b355ca.tar.bz2
linux-c1a567d31b5488f4593eae7ca215264947b355ca.zip
Merge 3.16-rc4 into staging-next
We want the staging tree fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/sound/asound.h')
0 files changed, 0 insertions, 0 deletions