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-04-15 14:14:05 -07:00

parent fd793d8905 8de53dfbf9

commit 791f58c064

2 changed files with 9 additions and 3 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

2

net/ipv4/Kconfig

View file

10

net/ipv4/ipmr.c

View file