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	Doc:misc-devices: Fix typo in Documentation/misc-devices	2015-09-18 10:04:24 -06:00
bh1770glc.txt
c2port.txt
eeprom
ics932s401
isl29003	Doc:misc-devices: Fix typo in Documentation/misc-devices	2015-09-18 10:04:24 -06:00
lcd-panel-cgram.txt	misc: Move panel driver out of staging	2016-02-03 14:14:22 -08:00
lis3lv02d
Makefile	Documentation: use subdir-y to avoid unnecessary built-in.o files	2014-09-26 11:02:55 +02:00
max6875	Doc:misc-devices: Fix typo in Documentation/misc-devices	2015-09-18 10:04:24 -06:00
spear-pcie-gadget.txt	Pratyush Anand has moved	2015-06-25 17:00:38 -07:00