Linus Torvalds 80445de577 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: (30 commits) e1000: fix virtualization bug bonding: fix alb mode locking regression Bluetooth: Fix issue with sysfs handling for connections usbnet: CDC EEM support (v5) tcp: Fix tcp_prequeue() to get correct rto_min value ehea: fix invalid pointer access ne2k-pci: Do not register device until initialized. Subject: [PATCH] br2684: restore net_dev initialization net: Only store high 16 bits of kernel generated filter priorities virtio_net: Fix function name typo virtio_net: Cleanup command queue scatterlist usage bonding: correct the cleanup in bond_create() virtio: add missing include to virtio_net.h smsc95xx: add support for LAN9512 and LAN9514 smsc95xx: configure LED outputs netconsole: take care of NETDEV_UNREGISTER event xt_socket: checks for the state of nf_conntrack bonding: bond_slave_info_query() fix cxgb3: fixing gcc 4.4 compiler warning: suggest parentheses around operand of ‘!’ netfilter: use likely() in xt_info_rdlock_bh() ...		2009-05-05 08:26:10 -07:00
..
9p	net/9p: handle correctly interrupted 9P requests	2009-04-05 16:54:53 -05:00
bluetooth	Bluetooth: Fix issue with sysfs handling for connections	2009-05-04 14:29:02 -07:00
irda	irda: Add irda_skb_cb qdisc related padding	2008-12-17 15:44:58 -08:00
iucv	[S390] iucv: Locking free version of iucv_message_(receive|send)	2008-12-25 13:39:04 +01:00
netfilter	netfilter: nf_nat: add support for persistent mappings	2009-04-16 18:33:01 +02:00
netns	netfilter: nf_conntrack: use SLAB_DESTROY_BY_RCU and get rid of call_rcu()	2009-03-25 21:05:46 +01:00
phonet	Phonet: use per-namespace devices list	2009-01-26 21:03:35 -08:00
sctp	sctp: Clean up TEST_FRAME hacks.	2009-03-21 13:41:09 -07: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 feature to hold bss	2009-03-27 20:13:13 -04:00
checksum.h
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_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
dn.h	decnet: compile fix for removal of byteorder wrapper	2008-11-27 23:04:13 -08:00
dsa.h	dsa: add switch chip cascading support	2009-03-21 19:06:54 -07:00
dsfield.h
dst.h
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
flow.h
garp.h
gen_stats.h	pkt_sched: gen_estimator: Optimize gen_estimator_active()	2008-11-26 15:24:32 -08:00
genetlink.h
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
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: move bsockets outside of read only beginning of struct inet_hashinfo	2009-02-01 12:31:33 -08:00
inet_sock.h
inet_timewait_sock.h
inetpeer.h
ip6_checksum.h
ip6_fib.h
ip6_route.h
ip6_tunnel.h
ip_fib.h
ip_vs.h	net: replace __constant_{endian} uses in net headers	2009-02-14 22:58:35 -08:00
ip.h	ip: support for TX timestamps on UDP and RAW sockets	2009-02-15 22:43:38 -08:00
ipcomp.h
ipconfig.h
ipip.h
ipv6.h	net: replace __constant_{endian} uses in net headers	2009-02-14 22:58:35 -08: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
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
llc.h
mac80211.h	mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi	2009-03-27 20:13:23 -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_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	netlink: add nla_policy_len()	2009-03-25 18:26:30 +01: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
pkt_sched.h	pkt_sched: sch_hfsc: sch_htb: Add non-work-conserving warning handler.	2009-02-01 01:12:42 -08: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
request_sock.h
rose.h
route.h
rtnetlink.h
sch_generic.h	net: reorder struct Qdisc for better SMP performance	2009-03-20 01:33:32 -07:00
scm.h
slhc_vj.h
snmp.h
sock.h	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-02-24 03:50:29 -08:00
stp.h
tcp_states.h
tcp.h	tcp: Fix tcp_prequeue() to get correct rto_min value	2009-05-04 11:11:01 -07:00
timewait_sock.h
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	wimax: fix typo in kernel-doc for debugfs_dentry in struct wimax_dev	2009-01-11 00:06:32 -08:00
wireless.h	cfg80211: Add AP beacon regulatory hints	2009-02-27 14:52:59 -05:00
x25.h
x25device.h
xfrm.h	netns xfrm: per-netns sysctls	2008-11-25 18:00:48 -08:00