---
- branch: MAIN
  date: Thu Nov 26 21:42:19 UTC 2015
  files:
  - new: '1.42'
    old: '1.41'
    path: src/sys/arch/evbarm/odroid/odroid_machdep.c
    pathrev: src/sys/arch/evbarm/odroid/odroid_machdep.c@1.42
    type: modified
  id: 20151126T214219Z.82a8935ba7bdd71d5dbc41e03186ad586936634f
  log: |
    repair conflicts from previous commit

    stupid marty checked in version with conflicts. bad marty no donut.
  module: src
  subject: 'CVS commit: src/sys/arch/evbarm/odroid'
  unixtime: '1448574139'
  user: marty