diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-03-03 20:59:12 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-03 20:59:12 +0100 |
commit | 9ffd2e9a174769913dcce0fbc9223b58d2eb5526 (patch) | |
tree | 1fbfc3eb8767f2f898316b4da6341da0b2a36bfe /drivers/net/wireless/ipw2x00/ipw2200.c | |
parent | brcmfmac: reset suspend flag upon sdio suspend failure (diff) | |
parent | Bluetooth: Remove unnecessary stop_scan_complete function (diff) | |
download | linux-9ffd2e9a174769913dcce0fbc9223b58d2eb5526.tar.xz linux-9ffd2e9a174769913dcce0fbc9223b58d2eb5526.zip |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2200.c')
0 files changed, 0 insertions, 0 deletions