-
Conflicts: kernel/wbgen-regs/tru-regs.h kernel/wbgen-regs/tru-regs.wb userspace/wrsw_rtud/rtu_tru_drv.c userspace/wrsw_rtud/rtu_tru_drv.h
ceabd3c4
Conflicts: kernel/wbgen-regs/tru-regs.h kernel/wbgen-regs/tru-regs.wb userspace/wrsw_rtud/rtu_tru_drv.c userspace/wrsw_rtud/rtu_tru_drv.h