mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
d210267741
This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
as102 | ||
cxd2099 | ||
dt3155v4l | ||
easycap | ||
go7007 | ||
lirc | ||
solo6x10 | ||
Kconfig | ||
Makefile |