summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove proprietary firmwareHEADreplicant-6.0-0003replicant-6.0-0002replicant-6.0-0001replicant-6.0Wolfgang Wiedmeyer2017-01-1939-515/+0
* Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-076-0/+0
|\
| * net: wireless: bcmdhd: Update bcm4354 FW (7.35.101.3) [DO NOT MERGE]Jerry Lee2016-05-272-0/+0
| * net: wireless: bcmdhd: Update bcm4339 FW (6.37.34.43) [DO NOT MERGE]Jerry Lee2016-05-272-0/+0
| * net: wireless: bcmdhd: Update bcm4356 FW (7.35.101.3) [DO NOT MERGE]Jerry Lee2016-05-272-0/+0
* | Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-038-0/+0
|\ \ | |/
| * net: wireless: bcmdhd: update bcm4358 FW (7.112.200.5) [DO NOT MERGE]Sreenath Sharma2016-03-262-0/+0
| * net: wireless: bcmdhd: Update bcm4354/56 FW(7.35.101.1) [DO NOT MERGE]Ashwin2016-03-264-0/+0
| * net: wireless: bcmdhd: update bcm4339 FW 6.37.32.RC23.34.42 [DO NOT MERGE]Insun Song2016-03-262-0/+0
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/ha...Steve Kondik2016-03-116-2/+18
|\ \
| * | Fix a potential leak of nl_msg objectsVinit Deshpande2015-12-141-0/+3
| * | Fix use-after-free in wifi_cleanup() am: 2ce1c4952dPaul Stewart2015-12-081-2/+2
| |\ \
| | * \ Fix use-after-free in wifi_cleanup()refs/keep-around/075a2c508582773018e098d653a98b3004764922Paul Stewart2015-12-081-2/+2
| | |\ \
| | | * | Fix use-after-free in wifi_cleanup()refs/keep-around/2ce1c4952d871f2baad0bc69dd8500f830f43db4Paul Stewart2015-12-071-2/+2
| * | | | Merge "Revert "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.44...Zach Jang2015-10-272-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge "Revert "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.44...refs/keep-around/0b49c186f3843084d4cb0f40f4381c94c6b5dd9aZach Jang2015-10-272-0/+0
| | |\ \ \
| | | * | | Revert "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.44)""Zach Jang2015-10-272-0/+0
| * | | | | Merge "Revert "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41...Zach Jang2015-10-272-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Revert "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41...refs/keep-around/7ca57f4b9baa0d0938fa0d1d899b5c7ebfec5424Zach Jang2015-10-272-0/+0
| | |\ \ \ \
| | | * | | | Revert "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)""Zach Jang2015-10-272-0/+0
| * | | | | | Merge "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)"" into...Zach Jang2015-10-272-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)"" into...refs/keep-around/93cabcfd50f4dc84ccaf4c1352221927c7661b18Zach Jang2015-10-272-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)"refs/keep-around/c907db16d1260243ada1baa79c0e3971df219dafZach Jang2015-10-272-0/+0
| * | | | | Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.44)"Zach Jang2015-10-272-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.44)"refs/keep-around/be0867bc045054d8a6e412576c794f5144a1709aZach Jang2015-10-272-0/+0
| * | | | | net: wireless: bcmdhd: update bcm4358 FW (7.112.100.44)Insun Song2015-10-212-0/+0
| |\ \ \ \ \ | | |/ / / /
| * | | | | net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)Insun Song2015-10-192-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | bcm4343: Update firmware BCM4343A0/BCM4343A1Prashant Malani2015-10-164-0/+0
| * | | | | am 5daef7b6: Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.35)"Ramanan Rajeswaran2015-09-282-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ am 0ad6d3d6: net: wireless: bcmdhd: update bcm4358 FW (7.112.100.35)Insun Song2015-09-252-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am d8c53dd0: net: wireless: bcmdhd: update bcm4358 FW (7.112.100.34)Insun Song2015-09-252-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 2e35620c: Merge "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.33)" ...Ed Tam2015-09-212-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am cf79ab6e: Merge "Fix crash caused in wifi_cleanup" into mnc-dr-devxin He2015-09-211-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am fd3dddcc: net: wireless: bcmdhd: update bcm4358 FW (7.112.100.32)Insun Song2015-09-182-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 8fddc3f5: Merge "Modify the cleanup procedure" into mnc-dr-devVinit Deshpande2015-09-042-17/+42
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 00ba595d: Merge "fix scan_id and flag for ScanData" into mnc-dr-devNavtej Singh Mann2015-09-041-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 4318bddf: Merge "Fix verbose log flag" into mnc-dr-devKevin Cernekee2015-09-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am bff0e406: am 3522524b: Merge "manual merge for N6 FW(7.35.79.100)" into mn...Prerepa Viswanadham2015-09-022-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ff4ce052: am 84b4a253: manual merge for N5 FW(6.37.32.RC23.34.40)Navtej Singh Mann2015-09-022-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35590913: net: wireless: bcmdhd: update bcm4358 FW (7.112.100.27)Insun Song2015-09-022-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5e13633c: Merge "wifi_hal: Fix array overflow retrieving gscan results" in...Kevin Cernekee2015-09-021-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7ae2edee: am 2d571e7e: net:wireless:bcmdhd: Update bcm4354 FW(7.35.79.101)Ritter Yeh2015-08-282-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cf576be2: Merge "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.26)" ...Ed Tam2015-08-262-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b07c9bbf: am 85113b28: Merge "net:wireless:bcmdhd: Update bcm4339 FW(6.37....Prerepa Viswanadham2015-08-262-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 04655e07: am aa544ae2: net:wireless:bcmdhd: Update bcm4356 FW(6.37.32.RC23...Ritter Yeh2015-08-262-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c9a71e69: net: wireless: bcmdhd: update bcm4358 FW(7.112.100.17)Insun Song2015-08-142-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aa6ab0f1: am 2c9d7bbf: Merge "Fix cleanup of COMPLETE_SCAN event" into mnc...Vinit Deshpande2015-08-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 768bccf4: Merge "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.1...Ed Tam2015-08-132-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c85df603: am 39ada30e: net:wireless:bcmdhd: Update bcm4339/54/56 FW(6.37.3...Ashwin2015-08-136-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 57ffe447: net: wireless: bcmdhd: update bcm4358 FW (7.112.100.15)Insun Song2015-08-112-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \