| commit | 725d0123dfff3d7b666cf57f5d29c50addfc99d3 | |
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| Mon, 9 May 2016 07:34:49 +0000 (9 09:34 +0200) | ||
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| Mon, 9 May 2016 07:34:49 +0000 (9 09:34 +0200) | ||
| tree | 12ec63b2c3965033f30185b4b2f5f12039a9a242 | treesnapshot (tar.gz zip) |
| parent | 8cd1f9d01cbf4f46eace90d9792e65a209c37d31 | commitdiff |
| parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 | commitdiff |
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>
This resolves a merge issue with drivers/hv/ring_buffer.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| MAINTAINERS | diff1 | diff2 | blobhistory |