-
Conflicts: drivers/Kconfig drivers/Makefile lib/Kconfig lib/Makefile lib/thc/thcsync.c Resolved-by: Vikram Narayanan <vikram186@gmail.com>
d57d12c0
Conflicts:
drivers/Kconfig
drivers/Makefile
lib/Kconfig
lib/Makefile
lib/thc/thcsync.c
Resolved-by: Vikram Narayanan <vikram186@gmail.com>