---
- branch: MAIN
  date: Thu Nov 30 19:42:59 UTC 2017
  files:
  - new: '0'
    old: 1.1.1.1
    path: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/.gitignore
    pathrev: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/.gitignore@0
    type: deleted
  - new: '1.5'
    old: '1.4'
    path: src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h
    pathrev: src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h@1.5
    type: modified
  - new: '0'
    old: 1.1.1.1
    path: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f429-pinfunc.h
    pathrev: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f429-pinfunc.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f746-pinfunc.h
    pathrev: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f746-pinfunc.h@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32h7-pinfunc.h
    pathrev: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32h7-pinfunc.h@0
    type: deleted
  id: 20171130T194259Z.c8a72470113bf5afa08606b937f8a466a25431a8
  log: "merge conflicts\n"
  module: src
  subject: 'CVS commit: src/sys/external/gpl2/dts/dist'
  unixtime: '1512070979'
  user: jmcneill