OSDN Git Service

This change fixes an incorrectly resolved merge.
authorVinit Deshpande <vinitd@google.com>
Thu, 22 May 2014 18:50:40 +0000 (11:50 -0700)
committerVinit Deshpande <vinitd@google.com>
Thu, 22 May 2014 18:52:18 +0000 (11:52 -0700)
commit189402af54746eed282edcce78b50be05825f12b
treed52ef3311712431b722c0a3ff3d682213866eedc
parentfa55add2699d27dc57c959a579196aa815a4b50e
This change fixes an incorrectly resolved merge.

Fw version: 6.37.34.21 must go with DHD driver version:1.88 gscan v2 (r)
modified:   bcmdhd/firmware/bcm4339/fw_bcmdhd.bin

cherry-picked from partner:klp-wireless-dev
SHA1 bdbe9e21b5b9f7d1b4018b50256869fb3b6b1df6

Change-Id: I2bfb61295c475bd79795c3fe27d2afbd83fbd16f
bcmdhd/firmware/bcm4339/fw_bcmdhd.bin