Greg Kroah-Hartman b3bb164aa5 Merge 5.5-rc2 into staging-next ... We want the staging driver fixes in here, and this resolves merge issues with the isdn code that was pointed out in linux-next Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2019-12-16 09:06:50 +01:00
..
hp100.c	staging: hp100: Use match_string() helper to simplify the code	2019-12-10 10:34:45 +01:00
hp100.h
Kconfig	staging: hp100: Fix build error without ETHERNET	2019-12-10 10:56:54 +01:00
Makefile