| commit | 725d0123dfff3d7b666cf57f5d29c50addfc99d3 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon May 09 09:34:49 2016 +0200 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon May 09 09:34:49 2016 +0200 |
| tree | 12ec63b2c3965033f30185b4b2f5f12039a9a242 | |
| parent | 8cd1f9d01cbf4f46eace90d9792e65a209c37d31 [diff] | |
| parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 [diff] |
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>