am 5d3b8bbf: am ab3e9a4c: Merge "broadcom/wlan: 64-bit compile issue"
authorMark Salyzyn <salyzyn@google.com>
Wed, 12 Mar 2014 23:29:49 +0000 (23:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Mar 2014 23:29:49 +0000 (23:29 +0000)
commit54e43fb7419dc971d7ec52e93e966b7500a2b4f9
tree2712a9b106d2fb3de2dbd805053a6addc2b6aa9c
parent6b034ef6fdbb76081e4dcd2cbb87ef3a2f5b2187
parent5d3b8bbf1788f38be13e5fb8a7724b2ad0e7ad58
am 5d3b8bbf: am ab3e9a4c: Merge "broadcom/wlan: 64-bit compile issue"

* commit '5d3b8bbf1788f38be13e5fb8a7724b2ad0e7ad58':
  broadcom/wlan: 64-bit compile issue
bcmdhd/wpa_supplicant_8_lib/driver_cmd_nl80211.c