Greg Kroah-Hartman bb27d4998a 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>
2016-02-22 14:46:24 -08:00
..
2014-01-29 20:40:08 +01:00
2011-03-31 11:26:23 -03:00
2015-06-25 17:00:38 -07:00