diff options
author | Pablo Neira Ayuso | 2019-06-25 01:32:59 +0200 |
---|---|---|
committer | Pablo Neira Ayuso | 2019-06-25 01:32:59 +0200 |
commit | 1c5ba67d2277ac2faf37c61076e8b5fa312be492 (patch) | |
tree | a645a1a2f7aea7faafcd67c6ba1bfd424b95cd7d /include/sound/aci.h | |
parent | netfilter: nf_tables: add support for matching IPv4 options (diff) | |
parent | Merge branch 'cxgb4-Reference-count-MPS-TCAM-entries-within-a-PF' (diff) | |
download | kernel-qcow2-linux-1c5ba67d2277ac2faf37c61076e8b5fa312be492.tar.gz kernel-qcow2-linux-1c5ba67d2277ac2faf37c61076e8b5fa312be492.tar.xz kernel-qcow2-linux-1c5ba67d2277ac2faf37c61076e8b5fa312be492.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflict between d2912cb15bdd ("treewide: Replace GPLv2
boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer
and fe03d4745675 ("Update my email address") which updates Jozsef
Kadlecsik's email.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/sound/aci.h')
0 files changed, 0 insertions, 0 deletions