Merge branch 'bfx2' into bfgminer

Conflicts:
	AUTHORS

AUTHORS

@@ -77,6 +77,7 @@ Rusty Russell <rusty@rustcorp.com.au>
 slax0r <frcole@gmail.com>
 Teemu Suikki <zuikkis@gmail.com>
 Thorsten Gilling <tgilling@web.de>
+Tim Bartletts <github@tim.bartletts.id.au>
 Tydus <Tydus@Tydus.org>
 Ufasoft <support@ufasoft.com>
 Vitalii Demianets <vitalii@orsoc.se>

README.ASIC

@@ -89,6 +89,21 @@ For example:
     sudo bfgminer -S bfsb:auto
 
 
+BFx2
+----
+
+You will need to install the WinUSB driver instead of the default FTDI serial
+driver. The easiest way to do this is using Zadig: http://zadig.akeo.ie/
+
+Note that since it's impossible to tell the BFx2 apart from various other
+devices (including BFL/Cairnsmore1 miners and even many non-mining devices!),
+you must run with the -S bfx:all option (or 'bfx:all' at the M+ menu).
+
+I do not know what this will do with other devices; it may start fires,
+launch nuclear missiles (please don't run BFGMiner on computers with
+missile controls), etc.
+
+
 BI*FURY
 -------