![]() This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
---|---|---|
.. | ||
drivers | ||
kcomedilib | ||
comedi.h | ||
comedi_compat32.c | ||
comedi_compat32.h | ||
comedi_fops.c | ||
comedi_fops.h | ||
comedidev.h | ||
comedilib.h | ||
drivers.c | ||
internal.h | ||
Kconfig | ||
Makefile | ||
proc.c | ||
range.c | ||
TODO |