---
- branch: MAIN
  date: Wed Dec  7 15:04:19 UTC 2011
  files:
  - new: '1.6'
    old: '1.5'
    path: src/sys/arch/xen/include/xen-public/event_channel.h
    pathrev: src/sys/arch/xen/include/xen-public/event_channel.h@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/sys/arch/xen/include/xen-public/grant_table.h
    pathrev: src/sys/arch/xen/include/xen-public/grant_table.h@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/sys/arch/xen/include/xen-public/physdev.h
    pathrev: src/sys/arch/xen/include/xen-public/physdev.h@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/sys/arch/xen/include/xen-public/trace.h
    pathrev: src/sys/arch/xen/include/xen-public/trace.h@1.6
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/sys/arch/xen/include/xen-public/xen.h
    pathrev: src/sys/arch/xen/include/xen-public/xen.h@1.11
    type: modified
  - new: '1.2'
    old: 1.1.1.2
    path: src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_32.h
    pathrev: src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_32.h@1.2
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/sys/arch/xen/include/xen-public/io/blkif.h
    pathrev: src/sys/arch/xen/include/xen-public/io/blkif.h@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/sys/arch/xen/include/xen-public/io/netif.h
    pathrev: src/sys/arch/xen/include/xen-public/io/netif.h@1.6
    type: modified
  - new: '1.2'
    old: 1.1.1.2
    path: src/sys/arch/xen/include/xen-public/io/xs_wire.h
    pathrev: src/sys/arch/xen/include/xen-public/io/xs_wire.h@1.2
    type: modified
  id: 20111207T150419Z.f6be219b6d4b12dcbe1869d4a3b1aae3cf49074f
  log: "merge.\n"
  module: src
  subject: 'CVS commit: src/sys/arch/xen/include/xen-public'
  unixtime: '1323270259'
  user: cegger