aboutsummaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-11-19 14:38:12 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-11-19 14:38:12 -0500
commit65210946f31007d12efcf66586fdcaf6ff3fa8f9 (patch)
tree08cb1916a8de38f5b4e3a72973f7694df218d98c /net/nfc
parente56108d92760c89ce21c30aa02588595b9396251 (diff)
parente1b69fdf33f63cfa600b992172d7376f9d9ef2e9 (diff)
downloadlinux-65210946f31007d12efcf66586fdcaf6ff3fa8f9.tar.gz
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions