Merge branch 'develop' of https://github.com/wernsaar/OpenBLAS into wernsaar-develop
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 21 May 2014 03:24:39 +0000 (11:24 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 21 May 2014 03:24:39 +0000 (11:24 +0800)
Conflicts:
kernel/arm/KERNEL.ARMV6

1  2 
Makefile
kernel/arm/KERNEL.ARMV6

diff --cc Makefile
Simple merge
Simple merge