summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-11-19 20:38:12 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-11-19 20:38:12 +0100
commit65210946f31007d12efcf66586fdcaf6ff3fa8f9 (patch)
tree08cb1916a8de38f5b4e3a72973f7694df218d98c /net/nfc
parentMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff)
parentiwlwifi: don't WARN when a non empty queue is disabled (diff)
downloadlinux-65210946f31007d12efcf66586fdcaf6ff3fa8f9.tar.xz
linux-65210946f31007d12efcf66586fdcaf6ff3fa8f9.zip
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