Merge branch 'cec-defines' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor...