Merge branch 'cec-defines' into for-linus