Merge branch 'lop3' of https://github.com/Genoil/cpp-ethereum into lop3

Conflicts:
	libethash-cuda/CMakeLists.txt
	libethash-cuda/keccak.cuh

libethash-cuda/CMakeLists.txt

@@ -25,5 +25,4 @@ CUDA_ADD_LIBRARY(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 TARGET_LINK_LIBRARIES(${EXECUTABLE} ${CUDA_LIBRARIES} ethash)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
-install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
-
+install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

libethash-cuda/dagger_shuffled.cuh

@@ -32,7 +32,7 @@ __device__ uint64_t compute_hash_shuffle(
 
 	uint4 mix;
 	uint2 shuffle[8];
-
+	
 	for (int i = 0; i < THREADS_PER_HASH; i++)
 	{
 		// share init among threads

libethash-cuda/keccak.cuh

@@ -41,9 +41,7 @@ uint2 chi(const uint2 a, const uint2 b, const uint2 c) {
 	asm("lop3.b32 %0, %1, %2, %3, 0xd2;" : "=r"(result.y) : "r"(a.y), "r"(b.y), "r"(c.y));
 	return result;
 }
-
 #else
-
 __device__ __forceinline__
 uint2 chi(const uint2 a, const uint2 b, const uint2 c) {
 	return a ^ (~b) & c;