| commit | 9f48c89862e39b7f33b44123fc425cf901c89428 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Jul 13 15:26:47 2014 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Jul 13 15:26:47 2014 -0700 |
| tree | 373886606ada8c2e0c362afbcce490af27d21552 | |
| parent | 2a211f320ee3d86835b40efd2948642482d3c933 [diff] | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab [diff] |
Merge 3.16-rc5 into char-misc-next This resolves a number of merge issues with changes in this tree and Linus's tree at the same time. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>