Merge remote branch 'origin/master' into pipe-video

diff --cc src/gallium/drivers/r600/r600_shader.c
index 80972b0,9c7b7f0..2bfe1be
--- 1/src/gallium/drivers/r600/r600_shader.c
--- 2/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@@ -1419,9 -1446,12 +1419,9 @@@ static int tgsi_pow(struct r600_shader_
        r = r600_bc_add_alu(ctx->bc, &alu);
        if (r)
                return r;
 -      r = r600_bc_add_literal(ctx->bc,ctx->value);
 -      if (r)
 -              return r;
        /* b * LOG2(a) */
        memset(&alu, 0, sizeof(struct r600_bc_alu));
-       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL_IEEE);
+       alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MUL);
        r = tgsi_src(ctx, &inst->Src[1], &alu.src[0]);
        if (r)
                return r;

diff --cc src/gallium/drivers/r600/r600_state.c
Simple merge