[Pkg-voip-commits] [dahdi-linux] 08/12: Merge tag 'upstream/2.10.2_dfsg'

[tzafrir at debian.org]

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

tzafrir pushed a commit to branch master
in repository dahdi-linux.

commit 061935d3abca51c7bf3d8f224e05558f3aa05482
Merge: 0574b7e 597326a
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Wed Aug 12 12:16:43 2015 +0200

    Merge tag 'upstream/2.10.2_dfsg'
    
    Upstream version 2.10.2~dfsg

 .version                             |  2 +-
 Makefile                             |  3 +-
 build_tools/dkms-helper              |  2 +-
 drivers/dahdi/dahdi-base.c           |  4 +++
 drivers/dahdi/dahdi_dynamic_eth.c    |  5 +++-
 drivers/dahdi/firmware/Makefile      |  8 +++---
 drivers/dahdi/pciradio.c             |  3 +-
 drivers/dahdi/tor2.c                 |  7 ++++-
 drivers/dahdi/voicebus/voicebus.c    |  2 +-
 drivers/dahdi/wcaxx-base.c           |  6 ++--
 drivers/dahdi/wcb4xxp/base.c         |  7 ++++-
 drivers/dahdi/wcfxo.c                |  2 +-
 drivers/dahdi/wct1xxp.c              | 10 +++++--
 drivers/dahdi/wct4xxp/base.c         |  4 +--
 drivers/dahdi/wctc4xxp/base.c        | 14 +++++----
 drivers/dahdi/wctdm.c                |  3 +-
 drivers/dahdi/wcte11xp.c             | 10 +++++--
 drivers/dahdi/wcte12xp/base.c        |  4 +--
 drivers/dahdi/wcte13xp-base.c        |  6 ++--
 drivers/dahdi/wcte43x-base.c         |  4 +--
 drivers/dahdi/wcxb.c                 | 56 ++++++++++++------------------------
 drivers/dahdi/wcxb.h                 |  7 +++--
 drivers/dahdi/xpp/card_pri.c         |  6 ++--
 drivers/dahdi/xpp/firmwares/Makefile |  9 ++++--
 drivers/dahdi/xpp/xproto.c           |  3 +-
 include/dahdi/kernel.h               | 24 ++++++++++++----
 26 files changed, 122 insertions(+), 89 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-linux.git