diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 09:34:49 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 09:34:49 +0200 |
commit | 725d0123dfff3d7b666cf57f5d29c50addfc99d3 (patch) | |
tree | 12ec63b2c3965033f30185b4b2f5f12039a9a242 /sound/drivers/mpu401 | |
parent | mcb: Delete num_cells variable which is not required (diff) | |
parent | Linux 4.6-rc7 (diff) | |
download | linux-725d0123dfff3d7b666cf57f5d29c50addfc99d3.tar.xz linux-725d0123dfff3d7b666cf57f5d29c50addfc99d3.zip |
Merge 4.6-rc7 into char-misc-testing
This resolves a merge issue with drivers/hv/ring_buffer.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/drivers/mpu401')
0 files changed, 0 insertions, 0 deletions