tree 373886606ada8c2e0c362afbcce490af27d21552
parent 2a211f320ee3d86835b40efd2948642482d3c933
parent 1795cd9b3a91d4b5473c97f491d63892442212ab
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1405290407 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1405290407 -0700

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>