Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
commit 7540bb8aa4056635f4d750018f551c7cf223a393 Merge: 01aac22 1ae5d31 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Jan 5 01:53:02 2014 +0800
Merge branch 'next'
7540bb8aa4056635f4d750018f551c7cf223a393 Makefile | 2 +- Makefile.kbuild | 2 +- bat_algo.h | 2 +- bat_iv_ogm.c | 2 +- bitarray.c | 2 +- bitarray.h | 2 +- bridge_loop_avoidance.c | 2 +- bridge_loop_avoidance.h | 2 +- compat.c | 2 +- compat.h | 2 +- debugfs.c | 2 +- debugfs.h | 2 +- distributed-arp-table.c | 2 +- distributed-arp-table.h | 2 +- fragmentation.c | 2 +- fragmentation.h | 2 +- gateway_client.c | 2 +- gateway_client.h | 2 +- gateway_common.c | 2 +- gateway_common.h | 2 +- hard-interface.c | 2 +- hard-interface.h | 2 +- hash.c | 2 +- hash.h | 2 +- icmp_socket.c | 2 +- icmp_socket.h | 2 +- main.c | 2 +- main.h | 4 ++-- network-coding.c | 2 +- network-coding.h | 2 +- originator.c | 2 +- originator.h | 2 +- packet.h | 2 +- routing.c | 2 +- routing.h | 2 +- send.c | 2 +- send.h | 2 +- soft-interface.c | 2 +- soft-interface.h | 2 +- sysfs.c | 2 +- sysfs.h | 2 +- translation-table.c | 2 +- translation-table.h | 2 +- types.h | 2 +- 44 files changed, 45 insertions(+), 45 deletions(-)