Linus Torvalds b1cdc4670b 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: (63 commits) drivers/net/usb/asix.c: Fix pointer cast. be2net: Bug fix to avoid disabling bottom half during firmware upgrade. proc_dointvec: write a single value hso: add support for new products Phonet: fix potential use-after-free in pep_sock_close() ath9k: remove VEOL support for ad-hoc ath9k: change beacon allocation to prefer the first beacon slot sock.h: fix kernel-doc warning cls_cgroup: Fix build error when built-in macvlan: do proper cleanup in macvlan_common_newlink() V2 be2net: Bug fix in init code in probe net/dccp: expansion of error code size ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep wireless: fix sta_info.h kernel-doc warnings wireless: fix mac80211.h kernel-doc warnings iwlwifi: testing the wrong variable in iwl_add_bssid_station() ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs() ath9k_htc: dereferencing before check in hif_usb_tx_cb() rt2x00: Fix rt2800usb TX descriptor writing. rt2x00: Fix failed SLEEP->AWAKE and AWAKE->SLEEP transitions. ...		2010-05-25 16:59:51 -07:00
..
9p	9p: add 9P2000.L rename operation	2010-05-21 16:44:34 -05:00
bluetooth	Bluetooth: Create per controller workqueue	2010-05-10 09:34:03 +02:00
caif	caif: Bugfix - use standard Linux lists	2010-05-23 23:57:41 -07:00
irda
iucv	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
netfilter	netfilter: nf_conntrack: fix a race in __nf_conntrack_confirm against nf_ct_get_next_corpse()	2010-05-20 15:55:30 +02:00
netns	ipv6: ip6mr: support multiple tables	2010-05-11 14:40:55 +02:00
phonet
sctp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
tc_act
tipc	tipc: Update commenting in TIPC API	2010-05-12 23:02:23 -07:00
act_api.h
addrconf.h
af_ieee802154.h
af_rxrpc.h
af_unix.h	net: sock_def_readable() and friends RCU conversion	2010-05-01 15:00:15 -07:00
ah.h
arp.h
atmclip.h
ax25.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ax88796.h
cfg80211.h	cfg80211/mac80211: better channel handling	2010-05-07 14:55:50 -04:00
checksum.h
cipso_ipv4.h
cls_cgroup.h	cls_cgroup: Fix build error when built-in	2010-05-24 23:53:37 -07:00
compat.h
datalink.h
dcbnl.h
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
dn.h
dsa.h
dsfield.h
dst_ops.h
dst.h	net: Introduce skb_tunnel_rx() helper	2010-05-17 22:36:55 -07:00
esp.h
ethoc.h
fib_rules.h	net: fib_rules: mark arguments to fib_rules_register const and __net_initdata	2010-04-26 16:02:04 +02:00
flow.h	flow: virtualize flow cache entry methods	2010-04-07 03:43:18 -07:00
garp.h
gen_stats.h
genetlink.h
icmp.h	ipv4: raw: move struct raw_sock and raw_sk() to include/net/raw.h	2010-04-13 14:49:31 -07:00
ieee80211_radiotap.h
ieee802154_netdev.h
ieee802154.h
if_inet6.h	ipv6: Replace inet6_ifaddr->dead with state	2010-05-18 15:36:06 -07:00
inet6_connection_sock.h	net: replace ipfragok with skb->local_df	2010-04-15 23:36:37 -07:00
inet6_hashtables.h
inet_common.h
inet_connection_sock.h	net: replace ipfragok with skb->local_df	2010-04-15 23:36:37 -07:00
inet_ecn.h
inet_frag.h
inet_hashtables.h
inet_sock.h	net: Make RFS socket operations not be inet specific.	2010-04-27 15:11:48 -07:00
inet_timewait_sock.h	net: suppress RCU lockdep false positive in twsk_net()	2010-04-27 12:39:01 -07:00
inetpeer.h
ip6_checksum.h
ip6_fib.h	ipv6 fib: Make rt6_info{} more cache-line aware.	2010-04-01 18:41:41 -07:00
ip6_route.h	net: sk_dst_cache RCUification	2010-04-13 01:41:33 -07:00
ip6_tunnel.h
ip_fib.h
ip_vs.h
ip.h	kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN	2010-05-25 08:07:02 -07:00
ipcomp.h
ipconfig.h
ipip.h
ipv6.h	kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN	2010-05-25 08:07:02 -07:00
ipx.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
iw_handler.h	include/net/iw_handler.h: Use SIOCIWFIRST not SIOCSIWCOMMIT in comment	2010-03-31 14:49:12 -04:00
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	wireless: fix mac80211.h kernel-doc warnings	2010-05-24 15:07:42 -04:00
mip6.h
mld.h	ipv6 mcast: Introduce include/net/mld.h for MLD definitions.	2010-04-23 13:35:55 +09:00
ndisc.h
neighbour.h	netfilter: bridge-netfilter: Fix MAC header handling with IP DNAT	2010-04-15 12:26:39 +02:00
net_namespace.h
netdma.h
netevent.h
netlabel.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
netlink.h
netrom.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
nexthop.h
nl802154.h
p8022.h
pkt_cls.h
pkt_sched.h	gen_estimator: deadlock fix	2010-04-01 18:38:48 -07:00
protocol.h
psnap.h
raw.h	ipv4: ipmr: support multiple tables	2010-04-13 14:49:34 -07:00
rawv6.h
red.h
regulatory.h
request_sock.h
rose.h
route.h	net: implements ip_route_input_noref()	2010-05-17 17:18:51 -07:00
rtnetlink.h
sch_generic.h	gen_estimator: deadlock fix	2010-04-01 18:38:48 -07:00
scm.h
slhc_vj.h
snmp.h	tcp: fix outsegs stat for TSO segments	2010-04-22 16:00:00 -07:00
sock.h	sock.h: fix kernel-doc warning	2010-05-24 23:54:18 -07:00
stp.h
tcp_states.h
tcp.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-16 22:26:58 -07:00
timewait_sock.h
transp_v6.h	IPv6: Add dontfrag argument to relevant functions	2010-04-23 23:35:28 -07:00
udp.h
udplite.h
wext.h
wimax.h
wpan-phy.h
x25.h	X25: Move accept approve flag to bitfield	2010-05-17 17:39:27 -07:00
x25device.h	X25: Add if_x25.h and x25 to device identifiers	2010-04-22 16:12:36 -07:00
xfrm.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00