]> rtime.felk.cvut.cz Git - arc.git/commitdiff
projects / arc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9582db9 670aeff)
Merge branch 'mikulka' of git@rtime.felk.cvut.cz:arc into mikulka mikulka
authorLeos Mikulka <mikulleo@fel.cvut.cz>
Fri, 3 May 2013 08:53:22 +0000 (10:53 +0200)
committerLeos Mikulka <mikulleo@fel.cvut.cz>
Fri, 3 May 2013 08:53:22 +0000 (10:53 +0200)
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


Trivial merge
ArcCore development for TMS570LS3137