[Pkg-bitcoin-commits] [cgminer] 03/04: Merge tag 'upstream/4.9.2'

[Scott Sheridan Howard]

This is an automated email from the git hooks/post-receive script.

showard pushed a commit to branch master
in repository cgminer.

commit 34d416c2c8b7c2161cefd2b92fc87b0e3e651731
Merge: e2e11c8 407a660
Author: Scott Howard <showard314 at gmail.com>
Date:   Thu Jun 25 11:11:54 2015 -0400

    Merge tag 'upstream/4.9.2'
    
    Upstream version 4.9.2
    
    Conflicts:
    	.gitignore

 .gitignore                                |   39 +
 01-cgminer.rules                          |    3 +
 API-README                                |   22 +-
 ASIC-README                               |   98 +-
 Makefile.am                               |   10 +-
 NEWS                                      |  212 +++
 README                                    |   62 +-
 api.c                                     |  265 ++--
 autogen.sh                                |    4 +-
 cgminer.c                                 | 1258 ++++++++----------
 compat/Makefile.am                        |    5 +-
 compat/jansson-2.6/src/Makefile.am        |    4 +-
 compat/jansson-2.6/src/dump.c             |   26 +-
 compat/jansson-2.6/src/hashtable.c        |   67 +-
 compat/jansson-2.6/src/hashtable.h        |    3 +-
 compat/jansson-2.6/src/hashtable_seed.c   |  278 ++++
 compat/jansson-2.6/src/jansson.def        |    1 +
 compat/jansson-2.6/src/jansson.h          |    7 +-
 compat/jansson-2.6/src/jansson_private.h  |    7 +-
 compat/jansson-2.6/src/lookup3.h          |  333 +++++
 compat/jansson-2.6/src/memory.c           |   26 +-
 compat/jansson-2.6/src/strbuffer.c        |   21 +-
 compat/jansson-2.6/src/strconv.c          |    3 +-
 compat/jansson-2.6/src/utf.h              |   20 +-
 compat/jansson-2.6/src/value.c            |   16 +
 compat/libusb-1.0/libusb/os/windows_usb.c |    2 +-
 configure.ac                              |  201 ++-
 driver-avalon.c                           |    9 +-
 driver-avalon2.c                          |   83 +-
 driver-avalon2.h                          |    2 +
 driver-avalon4.c                          | 2010 +++++++++++++++++++++++++++++
 driver-avalon4.h                          |  212 +++
 driver-bflsc.c                            |   32 +-
 driver-bflsc.h                            |    2 +-
 driver-bitfury.c                          |   40 +-
 driver-bitmain.c                          |  729 ++++++++---
 driver-bitmain.h                          |  100 +-
 driver-blockerupter.c                     |   11 +-
 driver-hashfast.c                         |  116 +-
 driver-hashfast.h                         |   38 +-
 driver-hashratio.c                        |   47 +-
 driver-hashratio.h                        |    2 +-
 driver-icarus.c                           |  387 ++++--
 driver-spondoolies-sp10-p.c               |    6 +-
 driver-spondoolies-sp10-p.h               |    7 +-
 driver-spondoolies-sp10.c                 |   12 +-
 driver-spondoolies-sp30-p.c               |   51 +-
 driver-spondoolies-sp30-p.h               |    7 +-
 driver-spondoolies-sp30.c                 |  188 +--
 driver-spondoolies-sp30.h                 |    3 +-
 libbitfury.c                              |   14 +-
 miner.h                                   |   59 +-
 usbutils.c                                |  269 ++--
 usbutils.h                                |    9 +-
 util.c                                    |  240 ++--
 util.h                                    |   15 +-
 56 files changed, 5867 insertions(+), 1826 deletions(-)

diff --cc .gitignore
index e7c332e,82cc189..fa71db5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,41 +1,43 @@@
 +.pc
++
+ nbproject
+ ccan/opt/.dirstamp
+ compat/jansson-2.6/jansson.pc
+ compat/jansson-2.6/libtool
+ compat/jansson-2.6/ltmain.sh
+ compat/jansson-2.6/m4/libtool.m4
+ compat/jansson-2.6/m4/ltoptions.m4
+ compat/jansson-2.6/m4/ltsugar.m4
+ compat/jansson-2.6/m4/ltversion.m4
+ compat/jansson-2.6/m4/lt~obsolete.m4
+ compat/jansson-2.6/src/.libs/
+ compat/jansson-2.6/src/dump.lo
+ compat/jansson-2.6/src/error.lo
+ compat/jansson-2.6/src/hashtable.lo
+ compat/jansson-2.6/src/jansson_config.h
+ compat/jansson-2.6/src/libjansson.la
+ compat/jansson-2.6/src/load.lo
+ compat/jansson-2.6/src/memory.lo
+ compat/jansson-2.6/src/pack_unpack.lo
+ compat/jansson-2.6/src/strbuffer.lo
+ compat/jansson-2.6/src/strconv.lo
+ compat/jansson-2.6/src/utf.lo
+ compat/jansson-2.6/src/value.lo
+ compat/libusb-1.0/libtool
+ compat/libusb-1.0/libusb-1.0.pc
+ compat/libusb-1.0/libusb/.libs/
+ compat/libusb-1.0/libusb/os/.dirstamp
+ compat/libusb-1.0/ltmain.sh
+ libtool
+ ltmain.sh
+ m4/libtool.m4
+ m4/ltoptions.m4
+ m4/ltsugar.m4
+ m4/ltversion.m4
+ m4/lt~obsolete.m4
+ 
+ 
+ 
  cgminer
  cgminer.exe
  minerd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/cgminer.git