summaryrefslogtreecommitdiff
path: root/geoip.conf
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-11 16:27:04 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-11 16:27:04 +0200
commit59f0273ca444f8266c12e3d8c0ca09439d0ce341 (patch)
treed4942af8255a16e67ecd52dd57aced2f2db1564c /geoip.conf
parentcc3d4df8271a6f6a73e7df8c110b3d5147f1f138 (diff)
ifpps: align string to format string
Just a whitespace fix to align the strings to the fmt string. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'geoip.conf')
0 files changed, 0 insertions, 0 deletions
ove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (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 'tools/virtio/asm')