Merge branch 'master' of github.com:pjreddie/darknet

Joseph Redmon

2015-08-11 eb98da5000f4d347ee8563467dffa4541e7faa7a

 src/softmax_layer_kernels.cu

@@ -4,8 +4,6 @@
#include "blas.h"
}

#define BLOCK 256

__global__ void forward_softmax_layer_kernel(int n, int batch, float *input, float *output)
{
    int b = (blockIdx.x + blockIdx.y*gridDim.x) * blockDim.x + threadIdx.x;