![]() This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
TODO | ||
debug.h | ||
general.c | ||
general.h | ||
ms.c | ||
ms.h | ||
rtsx.c | ||
rtsx.h | ||
rtsx_card.c | ||
rtsx_card.h | ||
rtsx_chip.c | ||
rtsx_chip.h | ||
rtsx_scsi.c | ||
rtsx_scsi.h | ||
rtsx_sys.h | ||
rtsx_transport.c | ||
rtsx_transport.h | ||
sd.c | ||
sd.h | ||
spi.c | ||
spi.h | ||
trace.h | ||
xd.c | ||
xd.h |