[Pkg-voip-commits] [dahdi-firmware] 40/71: Merge upstream version 2.6.1

[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-firmware.

commit 030c2114c990226e36d07400ba09646dae027a2a
Merge: 86d0102 16f9c6e
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Thu Mar 31 23:04:38 2016 +0300

    Merge upstream version 2.6.1

 .version                                           |     2 +-
 ChangeLog                                          |  5412 +----
 README                                             |   189 +-
 build_tools/live_dahdi                             |     6 +-
 drivers/dahdi/Kbuild                               |    17 +-
 drivers/dahdi/dahdi-base.c                         |   962 +-
 drivers/dahdi/dahdi-sysfs.c                        |   667 +
 drivers/dahdi/dahdi.h                              |    24 +
 drivers/dahdi/dahdi_dummy.c                        |    31 +-
 drivers/dahdi/dahdi_dynamic.c                      |    71 +-
 drivers/dahdi/dahdi_dynamic_eth.c                  |    57 +-
 drivers/dahdi/dahdi_dynamic_loc.c                  |     6 +-
 drivers/dahdi/firmware/Makefile                    |    42 +-
 .../oct612x/include/oct6100api/oct6100_defines.h   |     2 +-
 drivers/dahdi/pciradio.c                           |     7 +-
 drivers/dahdi/tor2.c                               |    42 +-
 drivers/dahdi/voicebus/GpakCust.c                  |     4 +-
 drivers/dahdi/voicebus/GpakCust.h                  |     1 +
 drivers/dahdi/voicebus/Kbuild                      |    15 +-
 drivers/dahdi/voicebus/voicebus.c                  |     2 +-
 drivers/dahdi/voicebus/voicebus.h                  |     9 +
 drivers/dahdi/voicebus/vpmoct.c                    |    54 +-
 drivers/dahdi/wcb4xxp/base.c                       |    50 +-
 drivers/dahdi/wcb4xxp/wcb4xxp.h                    |     1 +
 drivers/dahdi/wcfxo.c                              |    27 +-
 drivers/dahdi/wct1xxp.c                            |    27 +-
 drivers/dahdi/wct4xxp/Kbuild                       |     6 +-
 drivers/dahdi/wct4xxp/base.c                       |  2939 +--
 drivers/dahdi/wct4xxp/vpm450m.c                    |    35 +-
 drivers/dahdi/wct4xxp/wct4xxp.h                    |    22 +-
 drivers/dahdi/wctc4xxp/base.c                      |    35 +-
 drivers/dahdi/wctdm.c                              |    39 +-
 drivers/dahdi/wctdm24xxp/base.c                    |  1416 +-
 drivers/dahdi/wctdm24xxp/wctdm24xxp.h              |    63 +-
 drivers/dahdi/wcte11xp.c                           |    28 +-
 drivers/dahdi/wcte12xp/base.c                      |   415 +-
 drivers/dahdi/wcte12xp/wcte12xp.h                  |     8 +-
 drivers/dahdi/xpp/card_bri.c                       |   434 +-
 drivers/dahdi/xpp/card_fxo.h                       |     1 -
 drivers/dahdi/xpp/card_fxs.c                       |   154 +-
 drivers/dahdi/xpp/card_fxs.h                       |     1 -
 drivers/dahdi/xpp/card_global.c                    |   106 +-
 drivers/dahdi/xpp/card_global.h                    |     5 +-
 drivers/dahdi/xpp/card_pri.c                       |   133 +-
 drivers/dahdi/xpp/firmwares/FPGA_1141.hex          |  1267 +-
 drivers/dahdi/xpp/firmwares/FPGA_1151.hex          |  1384 +-
 drivers/dahdi/xpp/firmwares/FPGA_1161.201.hex      | 20685 +++++++++++++++++++
 drivers/dahdi/xpp/firmwares/FPGA_FXS.hex           |  1287 +-
 drivers/dahdi/xpp/firmwares/Makefile               |     6 +-
 drivers/dahdi/xpp/firmwares/PIC_TYPE_1.hex         |   856 +-
 drivers/dahdi/xpp/firmwares/USB_FW.201.hex         |   578 +
 drivers/dahdi/xpp/firmwares/USB_FW.hex             |  1112 +-
 drivers/dahdi/xpp/firmwares/USB_RECOV.hex          |   421 +
 drivers/dahdi/xpp/init_card_1_30                   |    17 +-
 drivers/dahdi/xpp/xbus-core.c                      |   154 +-
 drivers/dahdi/xpp/xbus-core.h                      |    11 +-
 drivers/dahdi/xpp/xbus-sysfs.c                     |    62 +-
 drivers/dahdi/xpp/xpd.h                            |     7 +
 drivers/dahdi/xpp/xpp_dahdi.c                      |   271 +-
 drivers/dahdi/xpp/xpp_dahdi.h                      |    11 +-
 drivers/dahdi/xpp/xpp_debug                        |    15 +-
 drivers/dahdi/xpp/xpp_usb.c                        |     8 +-
 drivers/dahdi/xpp/xproto.c                         |    14 +-
 include/dahdi/kernel.h                             |   186 +-
 64 files changed, 31075 insertions(+), 10844 deletions(-)

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