Merge branch 'connector-to-object-prop' of git://github.com/robclark/kernel-omap4...