Merge branch 'for_david' of git://git.open-mesh.org/linux-merge

Browse source

...

This commit is contained in:

David S. Miller 2011-11-26 14:26:24 -05:00

parent 6f39da2c5e 76e8d7b0d1

commit d6f03f29f7

14 changed files with 202 additions and 182 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

4

net/batman-adv/bat_sysfs.c

View file

2

net/batman-adv/bitarray.c

View file

151

net/batman-adv/gateway_client.c

View file

5

net/batman-adv/gateway_client.h

View file

4

net/batman-adv/gateway_common.c

View file

4

net/batman-adv/hash.c

View file

13

net/batman-adv/hash.h

View file

2

net/batman-adv/main.h

View file

13

net/batman-adv/originator.c

View file

2

net/batman-adv/originator.h

View file

22

net/batman-adv/routing.c

View file

43

net/batman-adv/soft-interface.c

View file

100

net/batman-adv/translation-table.c

View file

17

net/batman-adv/vis.c

View file