Merge branch 'cec-defines' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 19 Jun 2016 00:25:08 +0000 (17:25 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 19 Jun 2016 00:25:08 +0000 (17:25 -0700)
Let's bring in HDMI CEC defines to ease merging CEC support in the next
merge window.

1  2 
drivers/input/misc/uinput.c

Simple merge