Linus Torvalds d2aa455037 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (55 commits) netxen: fix tx ring accounting netxen: fix detection of cut-thru firmware mode forcedeth: fix dma api mismatches atm: sk_wmem_alloc initial value is one net: correct off-by-one write allocations reports via-velocity : fix no link detection on boot Net / e100: Fix suspend of devices that cannot be power managed TI DaVinci EMAC : Fix rmmod error net: group address list and its count ipv4: Fix fib_trie rebalancing, part 2 pkt_sched: Update drops stats in act_police sky2: version 1.23 sky2: add GRO support sky2: skb recycling sky2: reduce default transmit ring sky2: receive counter update sky2: fix shutdown synchronization sky2: PCI irq issues sky2: more receive shutdown sky2: turn off pause during shutdown ... Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck		2009-06-18 14:07:15 -07:00
..
9p	net/9p: handle correctly interrupted 9P requests	2009-04-05 16:54:53 -05:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6	2009-06-11 05:47:43 -07:00
ieee802154	net: add NL802154 interface for configuration of 802.15.4 devices	2009-06-09 05:25:33 -07:00
irda	irda: Add irda_skb_cb qdisc related padding	2008-12-17 15:44:58 -08:00
iucv	af_iucv: New socket option for setting IUCV MSGLIMITs	2009-04-23 04:04:38 -07:00
netfilter	netfilter: conntrack: optional reliable conntrack event delivery	2009-06-13 12:30:52 +02:00
netns	netfilter: conntrack: optional reliable conntrack event delivery	2009-06-13 12:30:52 +02:00
phonet	Phonet: use per-namespace devices list	2009-01-26 21:03:35 -08:00
sctp	sctp: support non-blocking version of the new sctp_connectx() API	2009-06-03 09:14:47 -04:00
tc_act
tipc
act_api.h
addrconf.h	ipv6: Fix conflict resolutions during ipv6 binding	2009-03-24 19:49:11 -07:00
af_rxrpc.h
af_unix.h	net: Fix soft lockups/OOM issues w/ unix garbage collector	2008-11-26 15:32:27 -08:00
ah.h
arp.h
atmclip.h	clip: convert to internal network_device_stats	2009-01-21 14:01:59 -08:00
ax25.h
ax88796.h	ax88796: Add method to take MAC from platform data	2009-03-24 23:32:03 -07:00
cfg80211.h	cfg80211: add rfkill support	2009-06-03 14:06:14 -04:00
checksum.h	include/net net/ - csum_partial - remove unnecessary casts	2008-11-19 15:44:53 -08:00
cipso_ipv4.h	netlabel: Label incoming TCP connections correctly in SELinux	2009-03-28 15:01:36 +11:00
compat.h
datalink.h
dcbnl.h	net: fix DCB setstate to return success/failure	2008-12-21 20:09:50 -08:00
dn.h	decnet: compile fix for removal of byteorder wrapper	2008-11-27 23:04:13 -08:00
dn_dev.h
dn_fib.h	decnet: remove private wrappers of endian helpers	2008-11-27 00:12:47 -08:00
dn_neigh.h
dn_nsp.h
dn_route.h
dsa.h	dsa: add switch chip cascading support	2009-03-21 19:06:54 -07:00
dsfield.h
dst.h	net: skb->dst accessors	2009-06-03 02:51:04 -07:00
esp.h
ethoc.h	net: Add support for the OpenCores 10/100 Mbps Ethernet MAC.	2009-03-27 00:16:21 -07:00
fib_rules.h	net: Remove unused parameter from fill method in fib_rules_ops.	2009-05-20 17:26:23 -07:00
flow.h	netns xfrm: lookup in netns	2008-11-25 17:35:18 -08:00
garp.h
gen_stats.h	pkt_sched: gen_estimator: Optimize gen_estimator_active()	2008-11-26 15:24:32 -08:00
genetlink.h	genetlink: Introduce genl_register_family_with_ops()	2009-05-21 16:50:22 -07:00
icmp.h
ieee80211_radiotap.h	wireless: radiotap updates	2009-03-27 20:12:52 -04:00
if_inet6.h	ipv6: reorder struct inet6_ifaddr to remove padding on 64 bit builds	2009-03-21 13:29:05 -07:00
inet6_connection_sock.h
inet6_hashtables.h	net: skb->dst accessors	2009-06-03 02:51:04 -07:00
inet_common.h
inet_connection_sock.h
inet_ecn.h	net: replace __constant_{endian} uses in net headers	2009-02-14 22:58:35 -08:00
inet_frag.h	inet fragments: fix sparse warning: context imbalance	2009-02-26 23:13:35 -08:00
inet_hashtables.h	net: skb->dst accessors	2009-06-03 02:51:04 -07:00
inet_sock.h	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck	2009-06-16 13:09:51 -07:00
inet_timewait_sock.h	net: annotate inet_timewait_sock bitfields	2009-06-15 15:49:32 +02:00
inetpeer.h
ip.h	snmp: add missing counters for RFC 4293	2009-04-27 02:45:02 -07:00
ip6_checksum.h
ip6_fib.h
ip6_route.h	net: skb->dst accessors	2009-06-03 02:51:04 -07:00
ip6_tunnel.h
ip_fib.h	ipv4: remove unused macro (FIB_RES_RESET) from ip_fib.h.	2009-05-03 14:19:51 -07:00
ip_vs.h	net: replace __constant_{endian} uses in net headers	2009-02-14 22:58:35 -08:00
ipcomp.h
ipconfig.h
ipip.h	sit: stateless autoconf for isatap	2009-05-19 16:02:02 -07:00
ipv6.h	snmp: add missing counters for RFC 4293	2009-04-27 02:45:02 -07:00
ipx.h	net: replace __constant_{endian} uses in net headers	2009-02-14 22:58:35 -08:00
iw_handler.h
lapb.h
lib80211.h	wireless: missing include in lib80211.h	2008-11-21 11:42:55 -05:00
llc.h
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
mac80211.h	mac80211: do not pass PS frames out of mac80211 again	2009-06-10 13:28:37 -04:00
mip6.h
ndisc.h	ipv6: Fix sporadic sendmsg -EINVAL when sending to multicast groups.	2009-01-04 16:04:39 -08:00
neighbour.h	net: Cleanup of neighbour code	2008-11-12 00:54:54 -08:00
net_namespace.h	netns: Remove net_alive	2009-03-03 01:14:27 -08:00
netdma.h	net_dma: convert to dma_find_channel	2009-01-06 11:38:15 -07:00
netevent.h
netlabel.h	netlabel: Cleanup the Smack/NetLabel code to fix incoming TCP connections	2009-03-28 15:01:37 +11:00
netlink.h	netfilter: conntrack: add support for DCCP handshake sequence to ctnetlink	2009-05-27 17:50:35 +02:00
netrom.h	netrom: convert to internal net_device_stats	2009-01-21 14:02:01 -08:00
nexthop.h
p8022.h
pkt_cls.h	ematch: simpler tcf_em_unregister()	2008-11-16 23:01:49 -08:00
pkt_sched.h	pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US	2009-06-15 02:31:47 -07:00
protocol.h	ipv6: Add GRO support	2009-01-08 10:40:57 -08:00
psnap.h	snap: use const for descriptor	2009-03-21 19:06:50 -07:00
raw.h
rawv6.h
red.h
regulatory.h	cfg80211: clean up includes	2009-04-22 16:57:17 -04:00
request_sock.h	net: Fix memory leak in the proto_register function	2008-11-21 16:45:22 -08:00
rose.h
route.h	net: skb->rtable accessor	2009-06-03 02:51:02 -07:00
rtnetlink.h
sch_generic.h	net: reorder struct Qdisc for better SMP performance	2009-03-20 01:33:32 -07:00
scm.h	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
slhc_vj.h
snmp.h	snmp: add missing counters for RFC 4293	2009-04-27 02:45:02 -07:00
sock.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
stp.h
tcp.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-08 02:48:30 -07:00
tcp_states.h
timewait_sock.h	net: Fix memory leak in the proto_register function	2008-11-21 16:45:22 -08:00
transp_v6.h	net: replace __constant_{endian} uses in net headers	2009-02-14 22:58:35 -08:00
udp.h	ipv6: Fix NULL pointer dereference with time-wait sockets	2009-04-11 01:53:06 -07:00
udplite.h
wext.h
wimax.h	rfkill: rewrite	2009-06-03 14:06:13 -04:00
x25.h	x25: Fix sleep from timer on socket destroy.	2009-06-16 05:40:30 -07:00
x25device.h
xfrm.h	net: skb->dst accessors	2009-06-03 02:51:04 -07:00