Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 01:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
e486463e82
linux/net/batman-adv
History
David S. Miller e486463e82 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-25 15:50:32 -07:00
..
bat_algo.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
bat_debugfs.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
bat_debugfs.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
bat_iv_ogm.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
bat_sysfs.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
bat_sysfs.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
bitarray.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
bitarray.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
bridge_loop_avoidance.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
bridge_loop_avoidance.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
gateway_client.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
gateway_client.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
gateway_common.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
gateway_common.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
hard-interface.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
hard-interface.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
hash.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
hash.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
icmp_socket.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
icmp_socket.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
Kconfig batman-adv: add bridge loop avoidance compile option 2012-04-11 14:29:00 +02:00
main.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
main.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
Makefile batman-adv: add bridge loop avoidance compile option 2012-04-11 14:29:00 +02:00
originator.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
originator.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
packet.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
ring_buffer.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
ring_buffer.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
routing.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
routing.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
send.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
send.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
soft-interface.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
soft-interface.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
translation-table.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
translation-table.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
types.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
unicast.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
unicast.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
vis.c batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00
vis.h batman-adv: Reformat multiline comments to consistent style 2012-06-20 22:15:33 +02:00