Conflicts:
arch/arm/arm_cr4/drivers/Can.c
boards/ti_tms570ls/examples/tms570_hdk_can/Tasks.c
boards/ti_tms570ls/examples/tms570_hdk_can/config/CanIf_Cfg.c
boards/ti_tms570ls/examples/tms570_hdk_can/config/Can_Cfg.h
boards/ti_tms570ls/examples/tms570_hdk_can/config/Can_Lcfg.c
boards/ti_tms570ls/examples/tms570_hdk_can/config/Com_PbCfg.c
boards/ti_tms570ls/examples/tms570_hdk_can/config/Port_Cfg.c
boards/ti_tms570ls/examples/tms570_hdk_can/config/Port_Cfg.h