tree dcabb8b8cc510003637323b30ed414b1a1ec86f6
parent 9676e84dfd641e3366a41f2c45ac5c55dbac820f
parent 35bf7692e765c2275bf93fe573f7ca868ab73453
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1456181184 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1456181184 -0800

Merge char-misc-next into staging-next

This resolves the merge issues and confusions people were having with
the goldfish drivers due to changes for them showing up in two different
trees.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>