diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-09-04 19:12:02 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-09-04 19:12:02 +0200 |
commit | 1bd3fa7b8c9b2936c16c6e6452f9cc991c405872 (patch) | |
tree | e1de7780149aabc7e1559c8f79f333ed625d9f1a /drivers/nfc/st21nfcb | |
parent | Merge tag 'mac80211-for-john-2014-08-29' of git://git.kernel.org/pub/scm/linu... (diff) | |
parent | iwlwifi: bump firmware API version to 10 for 7000 and 8000 (diff) | |
download | linux-1bd3fa7b8c9b2936c16c6e6452f9cc991c405872.tar.xz linux-1bd3fa7b8c9b2936c16c6e6452f9cc991c405872.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/nfc/st21nfcb')
0 files changed, 0 insertions, 0 deletions