Module Name: src Committed By: marty Date: Thu Nov 26 21:42:19 UTC 2015
Modified Files:
src/sys/arch/evbarm/odroid: odroid_machdep.c
Log Message:
repair conflicts from previous commit
stupid marty checked in version with conflicts. bad marty no donut.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/odroid/odroid_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
