Merge 4.2-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Aug 2015 23:28:09 +0000 (16:28 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Aug 2015 23:28:09 +0000 (16:28 -0700)
We want the fixes in Linus's tree in here as well.

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

diff --cc MAINTAINERS
Simple merge
Simple merge