Linus Torvalds 5587481e92 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits) ethoc: limit the number of buffers to 128 ethoc: use system memory as buffer ethoc: align received packet to make IP header at word boundary ethoc: fix buffer address mapping ethoc: fix typo to compute number of tx descriptors au1000_eth: Duplicate test of RX_OVERLEN bit in update_rx_stats() netxen: Fix Unlikely(x) > y pasemi_mac: ethtool get settings fix add maintainer for network drop monitor kernel service tg3: Fix phylib locking strategy rndis_host: support ETHTOOL_GPERMADDR ipv4: arp_notify address list bug gigaset: add kerneldoc comments gigaset: correct debugging output selection gigaset: improve error recovery gigaset: fix device ERROR response handling gigaset: announce if built with debugging gigaset: handle isoc frame errors more gracefully gigaset: linearize skb gigaset: fix reject/hangup handling ...		2009-10-08 11:59:30 -07:00
..
9p	virtio: add virtio IDs file	2009-09-23 22:26:32 +09:30
802	net: remove COMPAT_NET_DEV_OPS	2009-05-25 01:53:53 -07:00
8021q	net: fix vlan_get_size to include vlan_flags size	2009-09-26 20:16:07 -07:00
appletalk	Have atalk_route_packet() return NET_RX_SUCCESS not NET_XMIT_SUCCESS	2009-09-14 17:02:47 -07:00
atm	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
ax25	ax25: Fix possible oops in ax25_make_new	2009-09-30 16:44:12 -07:00
bluetooth	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
bridge	bridge: Fix double-free in br_add_if.	2009-09-28 12:54:25 -07:00
can	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
core	wext: let get_wireless_stats() sleep	2009-10-05 02:22:23 -07:00
dcb	net: fix double skb free in dcbnl	2009-09-26 20:16:15 -07:00
dccp	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
decnet	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
dsa	netdev: convert pseudo-devices to netdev_tx_t	2009-09-01 01:13:07 -07:00
econet	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
ethernet	net: remove COMPAT_NET_DEV_OPS	2009-05-25 01:53:53 -07:00
ieee802154	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
ipv4	ipv4: arp_notify address list bug	2009-10-07 03:18:17 -07:00
ipv6	sit: fix off-by-one in ipip6_tunnel_get_prl	2009-09-30 16:39:27 -07:00
ipx	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
irda	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
iucv	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
key	net: file_operations should be const	2009-09-02 01:03:53 -07:00
lapb	net: remove NET_RX_BAD and NET_RX_CN* defines	2009-07-05 19:15:35 -07:00
llc	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
mac80211	mac80211: Fix [re]association power saving issue on AP side	2009-09-29 17:25:15 -04:00
netfilter	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
netlabel	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-30 19:22:43 -07:00
netlink	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
netrom	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-09-30 17:36:45 -07:00
phonet	Phonet: fix mutex imbalance	2009-09-30 16:41:34 -07:00
rds	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
rfkill	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
rose	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
rxrpc	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
sched	trivial: fix typo "to to" in multiple files	2009-09-21 15:14:55 +02:00
sctp	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
sunrpc	net: fix htmldocs sunrpc, clnt.c	2009-09-24 15:39:14 -07:00
tipc	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
unix	net: unix: fix sending fds in multiple buffers	2009-09-11 11:31:45 -07:00
wanrouter	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
wimax	wimax: fix warning caused by not checking retval of rfkill_set_hw_state()	2009-06-11 11:12:48 -07:00
wireless	wext: add back wireless/ dir in sysfs for cfg80211 interfaces	2009-09-28 16:55:07 -04:00
x25	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
xfrm	net: file_operations should be const	2009-09-02 01:03:53 -07:00
Kconfig	net/compat/wext: send different messages to compat tasks	2009-07-15 08:53:39 -07:00
Makefile	net: remove redundant sched/ in net/Makefile	2009-07-12 20:11:14 -07:00
TUNABLE	…
compat.c	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
nonet.c	…
socket.c	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
sysctl_net.c	net: sysctl_net - use net_eq to compare nets	2009-03-16 16:23:30 +01:00