Merge commit '6a865f9' into bfgminer

Conflicts:
	driver-erupter.c

driver-erupter.c

@@ -105,6 +105,7 @@ static void erupter_drv_init()
 	erupter_drv_emerald.name = "BEE";
 	erupter_drv.lowl_match = erupter_emerald_lowl_match;
 	erupter_drv.lowl_probe = erupter_emerald_lowl_probe;
+	++erupter_drv_emerald.probe_priority;
 }
 
 struct device_drv erupter_drv = {