David S. Miller 1e13f863ca Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 ...

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

2010-12-10 09:50:47 -08:00

..

9p

9p: Add datasync to client side TFSYNC/RFSYNC for dotl

2010-10-28 09:08:49 -05:00

bluetooth

Bluetooth: clean up legal text

2010-12-01 21:04:43 -02:00

caif

include/net/caif/cfctrl.h: Remove unnecessary semicolons

2010-11-15 11:07:16 -08:00

irda

net: return operator cleanup

2010-09-23 14:33:39 -07:00

iucv

…

netfilter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-10-23 11:47:02 -07:00

netns

netns: let net_generic take pointer-to-const args

2010-11-21 10:05:10 -08:00

phonet

Phonet: 'connect' socket implementation for Pipe controller

2010-10-13 14:40:34 -07:00

sctp

sctp: kill unused macros in head file

2010-11-29 09:41:12 -08:00

tc_act

net/sched: add ACT_CSUM action to update packets checksums

2010-08-20 01:42:59 -07:00

act_api.h

…

addrconf.h

net: kill unused macros from head file

2010-12-02 13:27:33 -08:00

af_ieee802154.h

…

af_rxrpc.h

…

af_unix.h

af_unix: limit recursion level

2010-11-29 09:45:15 -08:00

ah.h

…

arp.h

arp: remove unnecessary export of arp_broken_ops

2010-09-29 19:45:35 -07:00

atmclip.h

…

ax25.h

…

ax88796.h

…

cfg80211.h

cfg80211: Add documentation for antenna ops

2010-12-02 15:16:59 -05:00

checksum.h

…

cipso_ipv4.h

…

cls_cgroup.h

Merge commit 'v2.6.36-rc7' into core/rcu

2010-10-07 09:43:45 +02:00

compat.h

…

datalink.h

…

dcbnl.h

…

dn_dev.h

decnet: RCU conversion and get rid of dev_base_lock

2010-11-08 13:50:08 -08:00

dn_fib.h

…

dn_neigh.h

…

dn_nsp.h

…

dn_route.h

ipv4: Make rt->fl.iif tests lest obscure.

2010-11-11 17:07:48 -08:00

dn.h

net: avoid limits overflow

2010-11-10 12:12:00 -08:00

dsa.h

…

dsfield.h

…

dst_ops.h

b43legacy: Fix compile on ARM architecture

2010-11-15 15:00:42 -05:00

dst.h

net: Abstract away all dst_entry metrics accesses.

2010-12-09 10:46:36 -08:00

esp.h

…

ethoc.h

…

fib_rules.h

fib_rules: __rcu annotates ctarget

2010-10-27 11:37:32 -07:00

flow.h

xfrm: use gre key as flow upper protocol info

2010-11-15 10:44:04 -08:00

garp.h

net/802: add __rcu annotations

2010-10-25 13:09:44 -07:00

gen_stats.h

…

genetlink.h

genetlink: introduce pre_doit/post_doit hooks

2010-10-05 13:35:30 -04:00

gre.h

PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)

2010-08-21 23:05:39 -07:00

icmp.h

…

ieee80211_radiotap.h

…

ieee802154_netdev.h

…

ieee802154.h

…

if_inet6.h

ipv6: mcast: RCU conversion

2010-11-24 11:16:42 -08:00

inet6_connection_sock.h

ipv6: Create inet6_csk_route_req().

2010-12-02 10:59:22 -08:00

inet6_hashtables.h

…

inet_common.h

…

inet_connection_sock.h

inet: Turn ->remember_stamp into ->get_peer in connection AF ops.

2010-11-30 12:28:06 -08:00

inet_ecn.h

net: return operator cleanup

2010-09-23 14:33:39 -07:00

inet_frag.h

…

inet_hashtables.h

tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()

2010-10-21 13:06:43 +02:00

inet_sock.h

net: optimize INET input path further

2010-12-09 20:05:58 -08:00

inet_timewait_sock.h

net: optimize INET input path further

2010-12-09 20:05:58 -08:00

inetpeer.h

inetpeer: Fix incorrect comment about inetpeer struct size.

2010-12-01 17:29:08 -08:00

ip6_checksum.h

…

ip6_fib.h

ipv6: Add infrastructure to bind inet_peer objects to routes.

2010-11-30 12:27:11 -08:00

ip6_route.h

net: kill unused macros from head file

2010-12-02 13:27:33 -08:00

ip6_tunnel.h

tunnels: add _rcu annotations

2010-10-25 13:09:45 -07:00

ip_fib.h

fib: Fix fib zone and its hash leak on namespace stop

2010-10-28 10:27:03 -07:00

ip_vs.h

ipvs: provide address family for debugging

2010-10-21 11:04:43 +02:00

ip.h

ipv4: add __rcu annotations to ip_ra_chain

2010-10-25 14:18:28 -07:00

ipcomp.h

…

ipconfig.h

…

ipip.h

tunnels: add __rcu annotations

2010-10-27 11:37:32 -07:00

ipv6.h

net: return operator cleanup

2010-09-23 14:33:39 -07:00

ipx.h

…

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/rt2x00: add ieee80211_tx_status_ni()

2010-11-30 13:53:46 -05:00

mip6.h

…

mld.h

…

ndisc.h

net: kill unused macros from head file

2010-12-02 13:27:33 -08:00

neighbour.h

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-11-19 13:13:47 -08:00

net_namespace.h

net_ns: add __rcu annotations

2010-10-25 14:18:27 -07:00

netdma.h

…

netevent.h

…

netlabel.h

…

netlink.h

netlink: let nlmsg and nla functions take pointer-to-const args

2010-11-16 09:52:32 -08:00

netrom.h

…

nexthop.h

…

nl802154.h

…

p8022.h

…

pkt_cls.h

…

pkt_sched.h

…

protocol.h

net: add __rcu annotations to protocol

2010-10-27 11:37:31 -07:00

psnap.h

…

raw.h

include/net/raw.h: Convert raw_seq_private macro to inline

2010-09-08 13:42:22 -07:00

rawv6.h

…

red.h

…

regulatory.h

cfg80211: Fix regulatory bug with multiple cards and delays

2010-11-22 15:48:51 -05:00

request_sock.h

…

rose.h

…

route.h

net: use the macros defined for the members of flowi

2010-11-17 12:27:45 -08:00

rtnetlink.h

rtnl: make link af-specific updates atomic

2010-11-27 22:56:08 -08:00

sch_generic.h

net_sched: remove the unused parameter of qdisc_create_dflt()

2010-10-21 03:09:47 -07:00

scm.h

scm: lower SCM_MAX_FD

2010-11-24 11:16:43 -08:00

slhc_vj.h

…

snmp.h

net: kill unused macros from head file

2010-12-02 13:27:33 -08:00

sock.h

net: optimize INET input path further

2010-12-09 20:05:58 -08:00

stp.h

…

tcp_states.h

…

tcp.h

net: kill unused macros from head file

2010-12-02 13:27:33 -08:00

timewait_sock.h

timewait_sock: Create and use getpeer op.

2010-12-01 18:09:13 -08:00

transp_v6.h

…

udp.h

net: avoid limits overflow

2010-11-10 12:12:00 -08:00

udplite.h

…

wext.h

…

wimax.h

…

wpan-phy.h

…

x25.h

X25 remove bkl in subscription ioctls

2010-11-28 11:12:20 -08:00

x25device.h

…

xfrm.h

xfrm: fix gre key endianess

2010-11-28 11:22:17 -08:00