David S. Miller 14599f1e34 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 ...

Conflicts:
	drivers/net/wireless/wl12xx/wl1271.h
	drivers/net/wireless/wl12xx/wl1271_cmd.h

2010-06-11 11:34:06 -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

net: CONFIG_NET_NS reduction

2010-06-02 05:16:23 -07:00

netns

ipv6: ip6mr: support multiple tables

2010-05-11 14:40:55 +02:00

phonet

phonet: use call_rcu for phonet device free

2010-06-09 16:14:25 -07:00

sctp

net: use __packed annotation

2010-06-03 03:21:52 -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

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

2010-06-11 11:34:06 -07:00

checksum.h

…

cipso_ipv4.h

…

cls_cgroup.h

cls_cgroup: Initialise classid when module is absent

2010-05-25 18:53:57 -07:00

compat.h

…

datalink.h

…

dcbnl.h

…

dn_dev.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

dn_fib.h

decnet: Remove unused FIB metric macros.

2010-03-27 19:23:46 -07:00

dn_neigh.h

…

dn_nsp.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

dn_route.h

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

dn.h

…

dsa.h

…

dsfield.h

…

dst_ops.h

…

dst.h

net: check for refcount if pop a stacked dst_entry

2010-06-04 15:56:00 -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

net: CONFIG_NET_NS reduction

2010-06-02 05:16:23 -07:00

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

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ip6_route.h

net: sk_dst_cache RCUification

2010-04-13 01:41:33 -07:00

ip6_tunnel.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

ip_fib.h

…

ip_vs.h

…

ip.h

ip: ip_ra_control() rcu fix

2010-06-10 22:47:08 -07:00

ipcomp.h

…

ipconfig.h

…

ipip.h

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ipv6.h

ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option

2010-06-02 07:08:31 -07:00

ipx.h

net: use __packed annotation

2010-06-03 03:21:52 -07: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 kernel-doc

2010-06-08 09:31:21 -04:00

mip6.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

mld.h

ipv6 mcast: Introduce include/net/mld.h for MLD definitions.

2010-04-23 13:35:55 +09:00

ndisc.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

neighbour.h

netfilter: bridge-netfilter: Fix MAC header handling with IP DNAT

2010-04-15 12:26:39 +02:00

net_namespace.h

nsproxy: remove INIT_NSPROXY()

2010-03-12 15:52:40 -08:00

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

netlink: fix unaligned access in nla_get_be64()

2010-03-19 22:47:23 -07:00

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

net: Define accessors to manipulate QDISC_STATE_RUNNING

2010-06-02 03:23:51 -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-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

rtnetlink.h

rtnetlink: support specifying device flags on device creation

2010-02-27 02:43:40 -08:00

sch_generic.h

net: add additional lock to qdisc to increase throughput

2010-06-02 05:09:29 -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

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

2010-06-06 17:42:02 -07:00

stp.h

…

tcp_states.h

…

tcp.h

tcp: Fix slowness in read /proc/net/tcp

2010-06-07 00:43:42 -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