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)
commit5d44f4b3484e85c8d4527ecaca5e536da774ae21
tree5c699fd097844ecdf30ef9b47444064d713ac410
parent4816693286d4ff9219b1cc72c2ab9c589448ebcb
parentf7644cbfcdf03528f0f450f3940c4985b2291f49
Merge 4.2-rc6 into char-misc-next

We want the fixes in Linus's tree in here as well.

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