summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r13' into HEADstable/cm-13.0-ZNH0EJessica Wagantall2016-02-021-2/+2
|\
| * merge in mnc-mr1-release history after reset to mnc-dr-devThe Android Automerger2015-12-170-0/+0
| |\
* | \ Merge tag 'android-6.0.1_r10' into HEADJessica Wagantall2016-01-050-0/+0
|\ \ \ | | |/ | |/|
| * | merge in mnc-mr1-release history after reset to mnc-dr-devThe Android Automerger2015-12-150-0/+0
| |\|
| | * Fix use-after-free in wifi_cleanup()Paul Stewart2015-12-101-2/+2
| |/
* | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/har...Steve Kondik2015-12-082-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-162-0/+0
| * Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.35)"Ramanan Rajeswaran2015-09-282-0/+0
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-055-26/+58
|\ \
| * | net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)Insun Song2015-10-192-0/+0
| * | Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.35)"Ramanan Rajeswaran2015-09-282-0/+0
| * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-250-0/+0
| |\ \ | | |/ | |/|
| | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-220-0/+0
| | |\
| | | * net: wireless: bcmdhd: update bcm4358 FW (7.112.100.32)Insun Song2015-09-182-0/+0
| | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-060-0/+0
| | | |\
| | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-030-0/+0
| | | | |\
| | | | | * net: wireless: bcmdhd: update bcm4358 FW (7.112.100.27)Insun Song2015-09-022-0/+0
| | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-020-0/+0
| | | | | |\
| | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-310-0/+0
| | | | | | |\
| | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | | | | |\
| | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | | | | |/| | | | | | | |/|/
| | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-260-0/+0
| | | | | | | |\
| | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-150-0/+0
| | | | | | | | |\
| | | | | | | | | * net: wireless: bcmdhd: update bcm4358 FW(7.112.100.17)Insun Song2015-08-142-0/+0
| | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-130-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-120-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-080-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-060-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-010-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * net:wireless:bcmdhd: Update bcm4354/56 FW (7.35.79.94)Chilam Ng2015-07-174-0/+0
| | | | | | | | | | | | | | * Fix couple of issues with unregistering event handlersVinit Deshpande2015-07-162-4/+4
| | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-160-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-140-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-110-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-090-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * Fix incorrect wifi_cleanupVinit Deshpande2015-07-087-47/+72
| | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-080-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | |\
| * | | | | | | | | | | | | | | | | | | | net: wireless: bcmdhd: update bcm4358 FW (7.112.100.35)Insun Song2015-09-242-0/+0
| * | | | | | | | | | | | | | | | | | | | net: wireless: bcmdhd: update bcm4358 FW (7.112.100.34)Insun Song2015-09-242-0/+0
| |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.33)" into mnc-dr-devEd Tam2015-09-212-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | net: wireless: bcmdhd: update bcm4358 FW (7.112.100.33)Insun Song2015-09-212-0/+0
| * | | | | | | | | | | | | | | | | | | | Merge "Fix crash caused in wifi_cleanup" into mnc-dr-devxin He2015-09-211-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Fix crash caused in wifi_cleanupAshwin2015-09-211-3/+3
| | |/ / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / net: wireless: bcmdhd: update bcm4358 FW (7.112.100.32)Insun Song2015-09-172-0/+0
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "Modify the cleanup procedure" into mnc-dr-devVinit Deshpande2015-09-042-17/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Modify the cleanup procedureAshwin2015-09-042-17/+42
| * | | | | | | | | | | | | | | | | | | Merge "fix scan_id and flag for ScanData" into mnc-dr-devNavtej Singh Mann2015-09-041-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | fix scan_id and flag for ScanDataNavtej Singh Mann2015-09-021-2/+3
| | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |