Merge branch 'master' of github.com:Yangqing/caffeine

Conflicts:
	src/caffeine/layers/inner_product_layer.cu

diff --cc src/caffeine/layers/inner_product_layer.cu
index 4cae30c,8130dcc..5afe146
--- 1/src/caffeine/layers/inner_product_layer.cu
--- 2/src/caffeine/layers/inner_product_layer.cu
+++ b/src/caffeine/layers/inner_product_layer.cu
@@@ -101,12 -95,12 +95,12 @@@ Dtype InnerProductLayer<Dtype>::Backwar
  }
  
  template <typename Dtype>
 -__global__ void BroadcastCopy(const int total, const int vec_len,
 -  const Dtype* in_vec, Dtype* out_matrix) {
 +__global__ void BroadcastRow(const int total, const int vec_len,
 +      const Dtype* in_vec, Dtype* out_matrix) {
    int index = threadIdx.x + blockIdx.x * blockDim.x;
    if (index < total) {
-       int v_index = index % vec_len;
-       out_matrix[index] = in_vec[v_index];
+     int v_index = index % vec_len;
+     out_matrix[index] = in_vec[v_index];
    }
  }