summaryrefslogtreecommitdiff
path: root/ifpps/.gitignore
diff options
context:
space:
mode:
authorStephen Wadeley <swadeley@redhat.com>2013-06-11 17:13:33 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-06-11 23:18:02 +0200
commit397483d79b222be420b7dc934e7751bb9d1829a6 (patch)
treed11fd32ec650c43e7ecd3997dc63da544853e9e4 /ifpps/.gitignore
parentf1e8419d9f5cf87570938fe5f4aafeb0e646478a (diff)
man: improvements to language for astraceroute.8
Signed-off-by: Stephen Wadeley <swadeley@redhat.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'ifpps/.gitignore')
0 files changed, 0 insertions, 0 deletions
gs/power/r8a7796-sysc.h?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 'include/dt-bindings/power/r8a7796-sysc.h')