diff options
author | David S. Miller <davem@davemloft.net> | 2015-06-23 13:24:58 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-23 13:24:58 +0300 |
commit | b1dfe0a80e49509bd34882a455ca625a5ae039ed (patch) | |
tree | ecc85135bf6a74b31b81b02206a67ab18c35ef29 /net/bridge/br_stp.c | |
parent | bfdc8dbdf840f2a96d7b4cbb73fc22d973c84441 (diff) | |
parent | fb77ff4f43990dc91926ce2704036a547482544e (diff) | |
download | linux-b1dfe0a80e49509bd34882a455ca625a5ae039ed.tar.xz |
Merge tag 'nfc-next-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
NFC 4.2 2nd pull request
This one only contains a one liner fix for a typo that I
introduced while cleaning some of the nfcmrvl patches that
were part of the 1st 4.2 pull request.
Diffstat (limited to 'net/bridge/br_stp.c')
0 files changed, 0 insertions, 0 deletions