FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-11 06:16:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/net/batman-adv
History
David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-07-10 23:56:33 -07:00
..
bat_algo.h
batman-adv: Reformat multiline comments to consistent style
2012-06-20 22:15:33 +02:00
bat_iv_ogm.c
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
bitarray.c
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
bitarray.h
batman-adv: Prefix main defines with BATADV_
2012-06-28 08:45:05 +02:00
bridge_loop_avoidance.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-10 23:56:33 -07:00
bridge_loop_avoidance.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-10 23:56:33 -07:00
debugfs.c
batman-adv: Fix alignment after opened parentheses
2012-07-01 22:47:23 +02:00
debugfs.h
batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}
2012-07-01 22:47:22 +02:00
gateway_client.c
batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}
2012-07-01 22:47:22 +02:00
gateway_client.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
gateway_common.c
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
gateway_common.h
batman-adv: Prefix gateway enum with BATADV_
2012-07-01 22:47:18 +02:00
hard-interface.c
batman-adv: Fix alignment after opened parentheses
2012-07-01 22:47:23 +02:00
hard-interface.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
hash.c
batman-adv: Remove space before semicolon
2012-07-01 22:47:23 +02:00
hash.h
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
icmp_socket.c
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
icmp_socket.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
Kconfig
batman-adv: add bridge loop avoidance compile option
2012-04-11 14:29:00 +02:00
main.c
batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}
2012-07-01 22:47:22 +02:00
main.h
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
Makefile
batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}
2012-07-01 22:47:22 +02:00
originator.c
batman-adv: Fix alignment after opened parentheses
2012-07-01 22:47:23 +02:00
originator.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
packet.h
batman-adv: Prefix packet structs with batadv_
2012-07-01 22:47:21 +02:00
ring_buffer.c
batman-adv: Prefix main defines with BATADV_
2012-06-28 08:45:05 +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: Fix alignment after opened parentheses
2012-07-01 22:47:23 +02:00
routing.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
send.c
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
send.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
soft-interface.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-10 23:56:33 -07:00
soft-interface.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
sysfs.c
batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}
2012-07-01 22:47:22 +02:00
sysfs.h
batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}
2012-07-01 22:47:22 +02:00
translation-table.c
batman-adv: Don't leak information through uninitialized packet fields
2012-07-01 22:47:24 +02:00
translation-table.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
types.h
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
unicast.c
batman-adv: Fix alignment after opened parentheses
2012-07-01 22:47:23 +02:00
unicast.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00
vis.c
batman-adv: Don't leak information through uninitialized packet fields
2012-07-01 22:47:24 +02:00
vis.h
batman-adv: Prefix types structs with batadv_
2012-07-01 22:47:21 +02:00