Merging r242412:

------------------------------------------------------------------------
r242412 | tstellar | 2015-07-16 09:13:34 -0700 (Thu, 16 Jul 2015) | 3 lines

AMDGPU/R600: Remove unused variable

This fixes a warning introduced by r242410.
------------------------------------------------------------------------

llvm-svn: 242455