OSDN Git Service

Merge 5.5-rc2 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Dec 2019 08:06:50 +0000 (09:06 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Dec 2019 08:06:50 +0000 (09:06 +0100)
commitb3bb164aa56018ad8476dd2953b654491b7fb468
tree781240b23aa2613222aac1aa633a9e4f86a934ec
parentf59aba2f75795e5b6a4f1aa31f3e20d7b71ca804
parentd1eef1c619749b2a57e514a3fa67d9a516ffa919
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>
MAINTAINERS
drivers/staging/exfat/exfat_super.c
drivers/staging/qlge/qlge_ethtool.c