Merge v5.15-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Dec 2021 09:17:10 +0000 (10:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Dec 2021 09:17:10 +0000 (10:17 +0100)
We need the fixes in here as well, and also resolve some merge conflicts
in:
drivers/misc/eeprom/at25.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/android/binder.c
drivers/misc/eeprom/at25.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge