From: Leos Mikulka Date: Fri, 3 May 2013 08:53:22 +0000 (+0200) Subject: Merge branch 'mikulka' of git@rtime.felk.cvut.cz:arc into mikulka X-Git-Url: https://rtime.felk.cvut.cz/gitweb/arc.git/commitdiff_plain Merge branch 'mikulka' of git@rtime.felk.cvut.cz:arc into mikulka 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 --- 3b48d94dfe288656126e455bff836a30694b5d14