summaryrefslogtreecommitdiff
path: root/sound/oss/sound_config.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/sound_config.h')
0 files changed, 0 insertions, 0 deletions
336d13c66fc171f336c6332fcb67339894e08'>diff)parent5f9a8a51d8b95505d8de8b7191ae2ed8c504d4af (diff)
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'Documentation')