diff options
author | Linus Torvalds | 2014-02-28 20:49:09 +0100 |
---|---|---|
committer | Linus Torvalds | 2014-02-28 20:49:09 +0100 |
commit | 04b5225216021173fdc8e4cde9ad2a6ed4824b8d (patch) | |
tree | 4d71a4eb257fd951d9c2acb3fee361e87e92b518 /net/netfilter/xt_comment.c | |
parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
parent | i7300_edac: Fix device reference count (diff) | |
download | kernel-qcow2-linux-04b5225216021173fdc8e4cde9ad2a6ed4824b8d.tar.gz kernel-qcow2-linux-04b5225216021173fdc8e4cde9ad2a6ed4824b8d.tar.xz kernel-qcow2-linux-04b5225216021173fdc8e4cde9ad2a6ed4824b8d.zip |
Merge tag 'edac_fixes_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC fixes from Borislav Petkov:
"Two fixes below for PCI devices disappearing when a reference count
underflow happens after a couple of insmod/rmmod cycles in succession"
* tag 'edac_fixes_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
i7300_edac: Fix device reference count
i7core_edac: Fix PCI device reference count
Diffstat (limited to 'net/netfilter/xt_comment.c')
0 files changed, 0 insertions, 0 deletions