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)
commitc01f3f5c3c2860f90e7b1aa4c183ec6b7949fa87
tree432944bb372304c25c0896fb2a7dfd8935b34fc4
parent0db5c79989de2c68d5abb7ba891bfdb3cd3b7e05
parent488326947cd1f038da8d2c9068a0d07b913b7983
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