From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Wed, 22 Jun 2016 11:33:50 +0000 (-0300)
Subject: Merge branch 'cec-defines' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor... 
X-Git-Tag: v4.8-rc1~152^2~122^2~18
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=c01f3f5c3c2860f90e7b1aa4c183ec6b7949fa87

Merge branch 'cec-defines' of git://git./linux/kernel/git/dtor/input into topic/cec

* 'cec-defines' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: add HDMI CEC specific keycodes
  Input: add BUS_CEC type
---

c01f3f5c3c2860f90e7b1aa4c183ec6b7949fa87