Merge tag 'omap-for-v3.12/cleanup-unused-defines' of git://git.kernel.org/pub/scm...