Merge tag 'topic/connector-locking-2015-07-23' of git://anongit.freedesktop.org/drm...