summaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_nat_core.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-03-02 13:55:36 -0800
committerDavid S. Miller <davem@davemloft.net>2019-03-02 13:55:36 -0800
commit2369afb6696c5a53772bfbc8b57b75dd40e46bfc (patch)
tree182b849e356af91e15964e4bb3fde47579b2f117 /net/netfilter/nf_nat_core.c
parent9eb359140cd307f8a14f61c19b155ffca5291057 (diff)
parent22eaf6c9946ae269061d95bb9ceee02524166474 (diff)
downloadlinux-stable-2369afb6696c5a53772bfbc8b57b75dd40e46bfc.tar.gz
linux-stable-2369afb6696c5a53772bfbc8b57b75dd40e46bfc.tar.bz2
linux-stable-2369afb6696c5a53772bfbc8b57b75dd40e46bfc.zip
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== pull request: bluetooth-next 2019-03-02 Here's one more bluetooth-next pull request for the 5.1 kernel: - Added support for MediaTek MT7663U and MT7668U UART devices - Cleanups & fixes to the hci_qca driver - Fixed wakeup pin behavior for QCA6174A controller Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_nat_core.c')
0 files changed, 0 insertions, 0 deletions