Greg Kroah-Hartman bb27d4998a Merge char-misc-next into staging-next ...

This resolves the merge issues and confusions people were having with
the goldfish drivers due to changes for them showing up in two different
trees.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2016-02-22 14:46:24 -08:00

..

mei

watchdog: mei_wdt: implement MEI iAMT watchdog driver

2016-02-06 22:11:06 -08:00

ad525x_dpot.txt

…

apds990x.txt

…

bh1770glc.txt

…

c2port.txt

…

eeprom

…

ics932s401

…

isl29003

…

lcd-panel-cgram.txt

…

lis3lv02d

…

Makefile

…

max6875

…

spear-pcie-gadget.txt

…