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)
commit6ea24cf79e055f0a62a64baa8587e2254a493c7b
treec5cd6113ed93854b1bc30cd471c366f080c4be2f
parent540c26087bfbad6ea72758b76b16ae6282a73fea
parent488326947cd1f038da8d2c9068a0d07b913b7983
Merge branch 'cec-defines' into for-linus

Let's bring in HDMI CEC defines to ease merging CEC support in the next
merge window.
drivers/input/misc/uinput.c