summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_oldDan Pasanen2016-12-052-0/+0
|\
| * net: wireless: bcmdhd: update bcm4358 FW (7.112.201.1)Insun Song2016-09-142-0/+0
* | Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/har...Steve Kondik2016-10-255-1/+1
|\ \
| * \ merge in nyc-dr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-090-0/+0
| |\ \ | | |/ | |/|
| | * merge in nyc-dr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-150-0/+0
| | |\
| | | * merge in nyc-dr1-release history after reset to nyc-mr1-devThe Android Automerger2016-07-070-0/+0
| | | |\ | | | |/ | | |/|
| * | | bcm4343: Update firmware BCM4343A0/BCM4343A1 am: d7e27ad324 am: deff754339Devin Kim2016-08-014-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | bcm4343: Update firmware BCM4343A0/BCM4343A1 am: d7e27ad324Devin Kim2016-08-014-0/+0
| | |\ \
| | | * \ bcm4343: Update firmware BCM4343A0/BCM4343A1Devin Kim2016-08-014-0/+0
| | | |\ \
| | | | * | bcm4343: Update firmware BCM4343A0/BCM4343A1Devin Kim2016-07-074-0/+0
| * | | | | WiFi HAL: fixing gscan batch result calculationSreenath Sharma2016-06-291-1/+1
| | |_|_|/ | |/| | |
| * | | | net: wireless: bcmdhd: Update bcm4354 FW (7.35.101.3)Jerry Lee2016-06-232-0/+0
| |\| | |
| * | | | net: wireless: bcmdhd: Update bcm4356 FW (7.35.101.3)Jerry Lee2016-06-222-0/+0
| |\ \ \ \
| * \ \ \ \ net: wireless: bcmdhd: Update bcm4358 FW (7.112.200.17)Jerry Lee2016-06-222-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ net: wireless: bcmdhd: Update bcm4354 FW (7.35.101.3) [DO NOT MERGE] am: 1458...Jerry Lee2016-05-270-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ net: wireless: bcmdhd: Update bcm4339 FW (6.37.34.43) [DO NOT MERGE] am: 98e5...Jerry Lee2016-05-270-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ net: wireless: bcmdhd: Update bcm4356 FW (7.35.101.3) [DO NOT MERGE] am: f040...Jerry Lee2016-05-270-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ net: wireless: bcmdhd: Update bcm4358 FW (7.112.100.48) [DO NOT MERGE] am: e2...Jerry Lee2016-05-270-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Revert "net: wireless: bcmdhd: Update bcm4354 FW (7.35.101.3)"Mark Salyzyn2016-05-262-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Revert "net: wireless: bcmdhd: Update bcm4354 FW (7.35.101.3)"Mark Salyzyn2016-05-252-0/+0
| * | | | | | | | | | | net: wireless: bcmdhd: Update bcm4354 FW (7.35.101.3)Jerry Lee2016-05-252-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | net: wireless: bcmdhd: Update bcm4354 FW (7.35.101.3)Jerry Lee2016-05-252-0/+0
| * | | | | | | | | | | Merge "WiFi HAL: fix delete mismatch warning" into nyc-devSreenath Sharma2016-05-051-1/+1
| |\| | | | | | | | | |
| * | | | | | | | | | | net: wireless: bcmdhd: update bcm4358 FW (7.112.200.12)Jun Lim2016-05-052-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge "WiFi HAL: GSCAN log spam fix" into nyc-devSreenath Sharma2016-05-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ WiFi HAL: memory leak fixSreenath Sharma2016-04-287-83/+197
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Revert "Set channel info only to avoid responder role breakage."" into...Wei Wang2016-04-251-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.200.9)"Ian Pedowitz2016-04-222-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ net: wireless: bcmdhd: update bcm4358 FW (7.112.200.9)Insun Song2016-04-212-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | net: wireless: bcmdhd: Update bcm4339 FW (6.37.34.43) [DO NOT MERGE]cm-14.0Jerry Lee2016-08-282-0/+0
* | | | | | | | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-020-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-010-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-260-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.200.9)"Ian Pedowitz2016-04-222-0/+0
| | | | | * | | | | | | | | | | | | net: wireless: bcmdhd: update bcm4358 FW (7.112.200.9)Insun Song2016-04-212-0/+0
| | | | | * | | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-140-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-120-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-110-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-110-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-110-0/+0
| | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-110-0/+0
| | | | | | | | |/| | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-100-0/+0
| | | | | | | |\| | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-040-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-040-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | net: wireless: bcmdhd: Update bcm4354 FW (7.35.101.3)Jerry Lee2016-06-232-0/+0
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | net: wireless: bcmdhd: Update bcm4356 FW (7.35.101.3)Jerry Lee2016-06-222-0/+0
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |