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
..
Kconfig	staging: android: binder: move to the "real" part of the kernel	2014-10-20 10:30:15 +08:00
Makefile	staging: android: binder: move to the "real" part of the kernel	2014-10-20 10:30:15 +08:00
binder.c	Merge char-misc-next into staging-next	2016-02-22 14:46:24 -08:00
binder_trace.h	staging: android: binder: move to the "real" part of the kernel	2014-10-20 10:30:15 +08:00