Merge commit '5d274cd4991022d63b014cc8917e00c15441d3f4'

Author: soumith

torch/lib/THC/generic/THCTensorMathBlas.cu

@@ -705,8 +705,8 @@ THC_API void THCTensor_(btrifact)(THCState *state, THCTensor *ra_, THCudaIntTens
 }
 
 
-THC_API void THCTensor_(btrisolve)(THCState *state, THCTensor *rb_, THCTensor *atf,
- THCTensor *b, THCudaIntTensor *pivots)
+THC_API void THCTensor_(btrisolve)(THCState *state, THCTensor *rb_, THCTensor *b,
+ THCTensor *atf, THCudaIntTensor *pivots)
 {
 #if defined(THC_REAL_IS_FLOAT) || defined(THC_REAL_IS_DOUBLE)
  THAssert(THCTensor_(checkGPU)(state, 3, rb_, atf, b));

torch/lib/THC/generic/THCTensorMathBlas.h

@@ -10,7 +10,7 @@ THC_API void THCTensor_(addbmm)(THCState *state, THCTensor *result, real beta, T
 THC_API void THCTensor_(baddbmm)(THCState *state, THCTensor *result, real beta, THCTensor *t, real alpha, THCTensor *batch1, THCTensor *batch2);
 
 THC_API void THCTensor_(btrifact)(THCState *state, THCTensor *ra_, THCudaIntTensor *rpivots_, THCudaIntTensor *rinfo_, THCTensor *a);
-THC_API void THCTensor_(btrisolve)(THCState *state, THCTensor *rb_, THCTensor *a, THCTensor *b, THCudaIntTensor *pivots);
+THC_API void THCTensor_(btrisolve)(THCState *state, THCTensor *rb_, THCTensor *b, THCTensor *atf, THCudaIntTensor *pivots);
 
 
 #endif