---
- branch: MAIN
  date: Wed Dec  7 13:24:04 UTC 2011
  files:
  - new: '1.5'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/arch-x86_32.h
    pathrev: src/sys/arch/xen/include/xen-public/arch-x86_32.h@1.5
    type: added
  - new: '1.5'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/arch-x86_64.h
    pathrev: src/sys/arch/xen/include/xen-public/arch-x86_64.h@1.5
    type: added
  - new: '1.5'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/dom0_ops.h
    pathrev: src/sys/arch/xen/include/xen-public/dom0_ops.h@1.5
    type: added
  - new: '1.5'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/event_channel.h
    pathrev: src/sys/arch/xen/include/xen-public/event_channel.h@1.5
    type: added
  - new: '1.5'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/grant_table.h
    pathrev: src/sys/arch/xen/include/xen-public/grant_table.h@1.5
    type: added
  - new: '1.5'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/physdev.h
    pathrev: src/sys/arch/xen/include/xen-public/physdev.h@1.5
    type: added
  - new: '1.5'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/trace.h
    pathrev: src/sys/arch/xen/include/xen-public/trace.h@1.5
    type: added
  - new: '1.10'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/xen.h
    pathrev: src/sys/arch/xen/include/xen-public/xen.h@1.10
    type: added
  - new: '1.5'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/io/blkif.h
    pathrev: src/sys/arch/xen/include/xen-public/io/blkif.h@1.5
    type: added
  - new: '1.5'
    old: '0'
    path: src/sys/arch/xen/include/xen-public/io/netif.h
    pathrev: src/sys/arch/xen/include/xen-public/io/netif.h@1.5
    type: added
  id: 20111207T132404Z.5a6973de3973d279bc6d7fc9aa8672031ee4f24a
  log: |
    merge. The 'conflicts' happened because xen-public was once used for xen2 headers.
  module: src
  subject: 'CVS commit: src/sys/arch/xen/include/xen-public'
  unixtime: '1323264244'
  user: cegger