Merge branch 'cec-defines' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor...
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 22 Jun 2016 11:33:50 +0000 (08:33 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 22 Jun 2016 11:33:50 +0000 (08:33 -0300)
* '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


Trivial merge