Merge branch 'avalon2' of https://github.com/xiangfu/cgminer into xiangfu-avalon2 Conflicts: api.c configure.ac