---
- branch: MAIN
  date: Thu May 21 22:01:42 UTC 2020
  files:
  - new: '1.82'
    old: '1.81'
    path: src/sys/arch/x86/x86/lapic.c
    pathrev: src/sys/arch/x86/x86/lapic.c@1.82
    type: modified
  id: 20200521T220142Z.b21fba290f0894c4eae9e2dffd7dc297e0d36a9f
  log: "Fix merge error\n"
  module: src
  subject: 'CVS commit: src/sys/arch/x86/x86'
  unixtime: '1590098502'
  user: ad