[GIT PULL] coresight: Fixes for v6.1