summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-09-26 19:33:58 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-09-26 19:33:58 +0200
commitd3d3e0017fcc2c3c8e5f6a229f4b65f8bcc15bae (patch)
tree4f8e9ed6eafd0b784bab4540373a210894bea96d /drivers/nfc
parentath9k: enable ext channel pulse detection (diff)
parentiwlwifi: mvm: Refactor and fix max probe len computation (diff)
downloadlinux-d3d3e0017fcc2c3c8e5f6a229f4b65f8bcc15bae.tar.xz
linux-d3d3e0017fcc2c3c8e5f6a229f4b65f8bcc15bae.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions