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
..
af_rxrpc.c
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ar-accept.c
ar-ack.c
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ar-call.c
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ar-connection.c
ar-connevent.c
rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
2011-05-19 18:35:58 -04:00
ar-error.c
ipv4: Kill ip_rt_frag_needed().
2012-06-11 02:08:59 -07:00
ar-input.c
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ar-internal.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ar-key.c
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ar-local.c
ar-output.c
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
ar-peer.c
net/rxrpc/ar-peer.c: remove invalid reference to list iterator variable
2012-07-09 15:24:33 -07:00
ar-proc.c
ar-recvmsg.c
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
ar-security.c
ar-skbuff.c
ar-transport.c
rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
2011-05-19 18:51:50 -04:00
Kconfig
Makefile
rxkad.c
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00