summaryrefslogtreecommitdiff
path: root/tprintf.h
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-04-12 13:31:09 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-04-12 13:31:09 +0200
commit028a72239f943bfe0e7ab9e193b646ea94ae81c2 (patch)
treec5eed6141210f449862a3f8a81d5a2bbef8ea42a /tprintf.h
parent421a77ce4f212edd022feda24a12688c28613711 (diff)
man: netsniff-ng: add geoip db mirror conf file
The list of used config files missed the geoip.conf. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'tprintf.h')
0 files changed, 0 insertions, 0 deletions
inux/net-next.git/diff/net/sunrpc/xprtrdma/backchannel.c?h=nds-private-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc/xprtrdma/backchannel.c')
erroneous setting of MSR_IA32_POWER_CTL BIT_EE on this model, allowing the default configuration to function as designed. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Reviewed-by: Len Brown <len.brown@intel.com> Cc: 4.6+ <stable@vger.kernel.org> # 4.6+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'net/ieee802154')