John W. Linville 3be3fdb58a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-tx.c

2011-06-28 13:56:21 -04:00

..

9p

net/9p: nwname should be an unsigned int

2011-04-15 15:26:15 -05:00

bluetooth

Bluetooth: Use bit operations on conn_state

2011-06-16 18:57:15 -03:00

caif

caif: Update documentation of CAIF transmit and receive functions.

2011-05-22 20:11:48 -04:00

irda

Fix common misspellings

2011-03-31 11:26:23 -03:00

iucv

Fix common misspellings

2011-03-31 11:26:23 -03:00

netfilter

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

netns

net: ipv4: add IPPROTO_ICMP socket kind

2011-05-13 16:08:13 -04:00

phonet

net: dont hold rtnl mutex during netlink dump callbacks

2011-05-02 15:26:28 -07:00

sctp

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

2011-05-20 13:43:21 -07:00

tc_act

…

act_api.h

…

addrconf.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

af_ieee802154.h

…

af_rxrpc.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

af_unix.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

ah.h

…

arp.h

…

atmclip.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

ax25.h

…

ax88796.h

…

cfg80211.h

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

2011-06-28 13:56:21 -04:00

checksum.h

…

cipso_ipv4.h

…

cls_cgroup.h

…

compat.h

net: Add sendmmsg socket system call

2011-05-05 11:10:14 -07:00

datalink.h

…

dcbevent.h

…

dcbnl.h

dcbnl: add support for retrieving peer configuration - cee

2011-03-02 21:58:55 -08:00

dn_dev.h

…

dn_fib.h

decnet: Convert to use flowidn where applicable.

2011-03-12 15:08:55 -08:00

dn_neigh.h

…

dn_nsp.h

…

dn_route.h

decnet: Convert to use flowidn where applicable.

2011-03-12 15:08:55 -08:00

dn.h

decnet: Convert to use flowidn where applicable.

2011-03-12 15:08:55 -08:00

dsa.h

…

dsfield.h

…

dst_ops.h

…

dst.h

dst: catch uninitialized metrics

2011-05-24 13:50:52 -04:00

esp.h

…

ethoc.h

…

fib_rules.h

…

flow.h

net: Order ports in same order as addresses in flow objects.

2011-03-31 18:03:35 -07:00

garp.h

garp: remove last synchronize_rcu() call

2011-05-12 17:46:56 -04:00

gen_stats.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

genetlink.h

netlink: advertise incomplete dumps

2011-06-22 16:09:45 -04:00

gre.h

…

icmp.h

…

ieee80211_radiotap.h

…

ieee802154_netdev.h

…

ieee802154.h

…

if_inet6.h

ipv6: reduce per device ICMP mib sizes

2011-05-19 16:21:22 -04:00

inet6_connection_sock.h

inet: Pass flowi to ->queue_xmit().

2011-05-08 15:28:28 -07:00

inet6_hashtables.h

…

inet_common.h

…

inet_connection_sock.h

ipv4: Make caller provide flowi4 key to inet_csk_route_req().

2011-05-18 18:32:03 -04:00

inet_ecn.h

ipv6: restore correct ECN handling on TCP xmit

2011-05-12 18:52:14 -04:00

inet_frag.h

…

inet_hashtables.h

…

inet_sock.h

inet: Decrease overhead of on-stack inet_cork.

2011-05-06 15:37:57 -07:00

inet_timewait_sock.h

…

inetpeer.h

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ip6_checksum.h

…

ip6_fib.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

ip6_route.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

ip6_tunnel.h

…

ip_fib.h

ipv4: Call fib_select_default() only when actually necessary.

2011-04-14 15:05:22 -07:00

ip_vs.h

IPVS: bug in ip_vs_ftp, same list heaad used in all netns.

2011-05-27 13:37:46 +02:00

ip.h

ipv4: Pass explicit daddr arg to ip_send_reply().

2011-05-10 13:32:46 -07:00

ipcomp.h

…

ipconfig.h

…

ipip.h

…

ipv6.h

ipv6: reduce per device ICMP mib sizes

2011-05-19 16:21:22 -04:00

ipx.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

iw_handler.h

Fix common misspellings

2011-03-31 11:26:23 -03: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

bonding,llc: Fix structure sizeof incompatibility for some PDUs

2011-05-13 15:13:24 -04:00

llc_s_ac.h

…

llc_s_ev.h

…

llc_s_st.h

…

llc_sap.h

…

llc.h

…

mac80211.h

mac80211: add cancel_hw_scan() callback

2011-06-17 14:22:18 -04:00

mip6.h

…

mld.h

…

ndisc.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

neighbour.h

…

net_namespace.h

net: Add linux/sysctl.h includes where needed.

2011-05-27 13:40:58 -04:00

net_ratelimit.h

net: Kill ratelimit.h dependency in linux/net.h

2011-05-27 13:41:33 -04:00

netdma.h

…

netevent.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

netlabel.h

…

netlink.h

netlink: advertise incomplete dumps

2011-06-22 16:09:45 -04:00

netrom.h

…

nexthop.h

…

nl802154.h

…

p8022.h

…

ping.h

net: ping: fix build failure

2011-05-17 14:16:58 -04:00

pkt_cls.h

…

pkt_sched.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

protocol.h

…

psnap.h

…

raw.h

…

rawv6.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

red.h

…

regulatory.h

…

request_sock.h

…

rose.h

rose: Add length checks to CALL_REQUEST parsing

2011-03-27 17:59:04 -07:00

route.h

ipv4: Pass explicit destination address to rt_bind_peer().

2011-05-18 18:42:43 -04:00

rtnetlink.h

…

sch_generic.h

net_sched: fix THROTTLED/RUNNING race

2011-03-24 00:13:14 -07:00

scm.h

…

slhc_vj.h

…

snmp.h

ipv6: reduce per device ICMP mib sizes

2011-05-19 16:21:22 -04:00

sock.h

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

2011-04-11 13:44:25 -07:00

stp.h

…

tcp_states.h

…

tcp.h

…

timewait_sock.h

…

transp_v6.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

udp.h

…

udplite.h

…

wext.h

…

wimax.h

net: Remove __KERNEL__ cpp checks from include/net

2011-04-24 10:54:56 -07:00

wpan-phy.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

x25.h

…

x25device.h

…

xfrm.h

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

2011-05-11 14:26:58 -04:00