Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6

Browse source

...

This commit is contained in:

David S. Miller 2010-05-12 23:30:45 -07:00

parent 0b9715e64f 5b285cac35

commit bf47f4b0ba

7 changed files with 703 additions and 298 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/linux/ipv6.h

View file

35

include/linux/mroute6.h

View file

3

include/linux/rtnetlink.h

View file