OSDN Git Service

Merge 5.0-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Feb 2019 08:05:58 +0000 (09:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Feb 2019 08:05:58 +0000 (09:05 +0100)
commit5c07488d996b6b2af609f351bf54c9909ed0fdf8
tree62cc2522698d7383cdf4a4f450bde30bc45f1832
parentb5390f4b5e0b75634c7f08c88e97b5fe0e833599
parentd13937116f1e82bf508a6325111b322c30c85eb9
Merge 5.0-rc6 into char-misc-next

We need the char-misc fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/android/binder.c
drivers/misc/mic/vop/vop_main.c
kernel/events/ring_buffer.c