David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
9p	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
802	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
8021q	vlan: Stop using NLA_PUT*().	2012-04-02 04:33:44 -04:00
appletalk	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
atm	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
ax25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-23 23:15:17 -04:00
batman-adv	batman-adv: skip the window protection test when the originator has no neighbours	2012-04-18 09:54:02 +02:00
bluetooth	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2012-04-27 15:16:43 -04:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
caif	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
can	can: fix sparse warning for cgw_list	2012-04-16 21:08:18 +02:00
ceph	crush: include header for global symbols	2012-04-27 00:03:34 -04:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
dcb	net: dcb: add CEE notify calls	2012-04-25 19:47:17 -04:00
dccp	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
decnet	net decnet: Convert to use register_net_sysctl	2012-04-20 21:22:29 -04:00
dns_resolver	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
dsa	dsa: Move switch drivers to new directory drivers/net/dsa	2011-11-29 00:21:36 -05:00
econet	sock: Introduce named constants for sk_reuse	2012-04-21 15:52:25 -04:00
ethernet	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
ieee802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
ipv6	tcp: be more strict before accepting ECN negociation	2012-05-04 12:05:27 -04:00
ipx	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
irda	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
iucv	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2012-03-22 18:15:32 -07:00
key	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
lapb	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
llc	net: add a limit parameter to sk_add_backlog()	2012-04-23 22:28:28 -04:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
netlabel	netlabel: use GFP flags from caller instead of GFP_ATOMIC	2012-03-22 19:29:57 -04:00
netlink	af_netlink: drop_monitor/dropwatch friendly	2012-04-24 00:35:14 -04:00
netrom	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
nfc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-04-18 14:27:48 -04:00
openvswitch	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
packet	af_packet: packet_getsockopt() cleanup	2012-04-21 16:36:42 -04:00
phonet	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
rds	sock: Introduce named constants for sk_reuse	2012-04-21 15:52:25 -04:00
rfkill	device.h: cleanup users outside of linux/include (C files)	2012-03-11 14:27:37 -04:00
rose	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
rxrpc	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
sctp	net: add a limit parameter to sk_add_backlog()	2012-04-23 22:28:28 -04:00
sunrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
tipc	tipc: compress out gratuitous extra carriage returns	2012-04-30 15:53:56 -04:00
unix	net: sock_diag_handler structs can be const	2012-04-25 20:46:59 -04:00
wanrouter	wanrouter: Remove kernel_lock annotations	2011-11-07 13:27:30 -05: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-04-26 15:03:48 -04:00
x25	net: add a limit parameter to sk_add_backlog()	2012-04-23 22:28:28 -04:00
xfrm	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
compat.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
Kconfig	net: Add Open vSwitch kernel components.	2011-12-03 09:35:17 -08:00
Makefile	net: Add Open vSwitch kernel components.	2011-12-03 09:35:17 -08:00
nonet.c
socket.c	net: change big iov allocations	2012-04-21 16:24:20 -04:00
sysctl_net.c	net: Remove register_net_sysctl_table	2012-04-20 21:22:30 -04:00