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
..
9p	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
802	tokenring: delete all remaining driver support	2012-05-15 20:23:16 -04:00
8021q	net: Fix memory leak - vlan_info struct	2012-07-10 23:32:27 -07:00
appletalk	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
atm	net: Remove casts to same type	2012-06-04 11:45:11 -04:00
ax25	small cleanup in ax25_addr_parse()	2012-07-09 00:16:16 -07:00
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-06-29 12:07:37 -04:00
bridge	br_netfilter: Convert to dst_neigh_lookup_skb().	2012-07-05 01:10:05 -07:00
caif	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
can	can: fix sparse warning in af_can.c	2012-07-02 11:07:27 +02:00
ceph	net: Fix non-kernel-doc comments with kernel-doc start marker	2012-07-10 23:13:45 -07:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
dcb	net: Fix non-kernel-doc comments with kernel-doc start marker	2012-07-10 23:13:45 -07:00
dccp	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
decnet	rtnetlink: Remove ts/tsage args to rtnl_put_cacheinfo().	2012-07-10 22:40:13 -07:00
dns_resolver	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-05-21 20:27:36 -07:00
dsa	dsa: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:19 -04:00
ethernet	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
ieee802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
ipv4	net: Fix non-kernel-doc comments with kernel-doc start marker	2012-07-10 23:13:45 -07:00
ipv6	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
ipx	ipx: Remove spurious NULL checking in ipx_ioctl().	2012-05-19 00:51:04 -04:00
irda	net: Remove casts to same type	2012-06-04 11:45:11 -04:00
iucv	net: remove skb_orphan_try()	2012-06-15 15:30:15 -07:00
key	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
l2tp	net: l2tp_eth: provide tx_dropped counter	2012-06-29 00:52:32 -07:00
lapb	lapb: Neaten debugging	2012-05-17 18:45:20 -04:00
llc	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
mac802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
netlabel	netlabel: use GFP flags from caller instead of GFP_ATOMIC	2012-03-22 19:29:57 -04:00
netlink	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
netrom	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
nfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-16 22:17:37 -04:00
packet	net: added support for 40GbE link.	2012-06-27 15:42:24 -07:00
phonet	net: remove my future former mail address	2012-06-17 16:29:38 -07:00
rds	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
rfkill	rfkill: Add the capability to switch all devices of all type in __rfkill_switch_all().	2012-06-06 15:18:17 -04:00
rose	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
sctp	sctp: refactor sctp_packet_append_chunk and clenup some memory leaks	2012-07-08 23:56:16 -07:00
sunrpc	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
tipc	net: Fix non-kernel-doc comments with kernel-doc start marker	2012-07-10 23:13:45 -07:00
unix	unix_diag: Do not use RTA_PUT() macros	2012-06-27 15:36:43 -07:00
wanrouter	net/wanrouter: Deprecate and schedule for removal	2012-05-24 16:22:53 -04:00
wimax	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
wireless	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-06-29 12:42:14 -04:00
x25	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
xfrm	xfrm: No need to copy generic neighbour pointer.	2012-07-05 02:42:00 -07:00
compat.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-05-21 20:27:36 -07:00
Kconfig	net: drop NET dependency from HAVE_BPF_JIT	2012-05-21 12:50:12 -07:00
Makefile	econet: remove ancient bug ridden protocol	2012-05-18 01:35:08 -04:00
nonet.c
socket.c	Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2012-05-22 17:37:47 -07:00
sysctl_net.c	net: delete all instances of special processing for token ring	2012-05-15 20:14:35 -04:00