merge error, revealed by clang; ok kettenis@
authornaddy <naddy@openbsd.org>
Mon, 3 Jul 2017 13:26:04 +0000 (13:26 +0000)
committernaddy <naddy@openbsd.org>
Mon, 3 Jul 2017 13:26:04 +0000 (13:26 +0000)
commit50cc059d3817d37129d2e650d0c3ea72244032f8
treee00261f27d454500c25065f02b3bae2fd93deda7
parent9017429c5fca582268b459cc1fd5a0966278e72e
merge error, revealed by clang; ok kettenis@
sys/dev/pci/drm/i915/intel_i2c.c