summaryrefslogtreecommitdiff
path: root/sysdep/linux/syspriv.h
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2012-07-16 14:44:45 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2012-07-16 14:44:45 +0200
commitabced4a91495e27fe86b142bc1967cec53bab3dc (patch)
treef6aead6b370caf7515855726e4e54ca7ee95224c /sysdep/linux/syspriv.h
parentfc06fb62443c135773ee4c05ed83925cc47b046d (diff)
parent761702644397886bd3c1be10fd55c01485b7c454 (diff)
Merge branch 'rt-accepted'
Conflicts: nest/config.Y nest/rt-table.c proto/bgp/bgp.c
Diffstat (limited to 'sysdep/linux/syspriv.h')
0 files changed, 0 insertions, 0 deletions