Merge branch release-5-1 into release-2016
commit0986ec764ea5c3515ee9f1ce084ad4fa241754f5
authorBerk Hess <hess@kth.se>
Wed, 24 Aug 2016 11:12:21 +0000 (24 13:12 +0200)
committerBerk Hess <hess@kth.se>
Wed, 24 Aug 2016 11:14:22 +0000 (24 13:14 +0200)
tree366438257c1b00f35b9264c3dc117285cd0a252e
parent82e0f41878f24cf62504c2e3770d6032249ae084
parent2fffbdbf8dd8573714661f4f6eeb46221a40f094
Merge branch release-5-1 into release-2016

Also applied the merged fix to nbnxn_cuda_kernel_fermi.cuh.

Change-Id: I79d0cb59214290097d6f356e35dd13c4eadaed75
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel_fermi.cuh
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_amd.clh
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_nowarp.clh
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_nvidia.clh