David S. Miller 9b963e5d0e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/ieee802154/fakehard.c
	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/phy.c
	drivers/net/netxen/netxen_nic_init.c
	drivers/net/wireless/ath/ath9k/main.c

2009-11-29 00:57:15 -08:00

..

9p

9p: fix readdir corner cases

2009-11-02 08:43:45 -06:00

bluetooth

net: mark net_proto_ops as const

2009-10-07 01:10:46 -07:00

irda

net: mark read-only arrays as const

2009-08-05 10:42:58 -07:00

iucv

…

netfilter

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

2009-11-06 00:55:55 -08:00

netns

netns: embed ip6_dst_ops directly

2009-09-01 17:40:31 -07:00

phonet

Phonet: convert devices list to RCU

2009-11-18 10:08:26 -08:00

sctp

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

2009-11-29 00:57:15 -08:00

tc_act

pkt_sched: skbedit add support for setting mark

2009-10-22 21:56:42 -07:00

tipc

…

act_api.h

net: restore gnet_stats_basic to previous definition

2009-08-17 21:33:49 -07:00

addrconf.h

bonding: remap muticast addresses without using dev_close() and dev_open()

2009-09-15 02:37:40 -07:00

af_ieee802154.h

af_ieee802154: add support for WANT_ACK socket option

2009-08-12 21:54:50 -07:00

af_rxrpc.h

…

af_unix.h

…

ah.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

arp.h

net: make neigh_ops constant

2009-09-01 17:40:57 -07:00

atmclip.h

…

ax25.h

…

ax88796.h

…

cfg80211.h

mac80211: avoid spurious deauth frames/messages

2009-11-19 11:09:02 -05:00

checksum.h

…

cipso_ipv4.h

…

compat.h

net: Avoid compiler warning for mmsghdr when CONFIG_COMPAT is not selected

2009-10-20 01:09:17 -07:00

datalink.h

…

dcbnl.h

dcbnl: Add support for setapp/getapp to netdev dcbnl_rtnl_ops

2009-09-01 01:24:30 -07:00

dn_dev.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

dn_fib.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

dn_neigh.h

…

dn_nsp.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

dn_route.h

…

dn.h

…

dsa.h

…

dsfield.h

…

dst_ops.h

netns: embed ip6_dst_ops directly

2009-09-01 17:40:31 -07:00

dst.h

tcp: Use defaults when no route options are available

2009-11-04 23:24:15 -08:00

esp.h

…

ethoc.h

…

fib_rules.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

flow.h

…

garp.h

…

gen_stats.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

genetlink.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

icmp.h

…

ieee80211_radiotap.h

mac80211: fix radiotap header generation

2009-10-30 16:49:20 -04:00

ieee802154_netdev.h

ieee802154: add an mlme_ops call to retrieve PHY object

2009-11-06 14:32:18 +03:00

ieee802154.h

…

if_inet6.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

inet6_connection_sock.h

…

inet6_hashtables.h

inet: rename some inet_sock fields

2009-10-18 18:52:53 -07:00

inet_common.h

…

inet_connection_sock.h

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

inet_ecn.h

…

inet_frag.h

…

inet_hashtables.h

inet: fix inet_bind_bucket_for_each

2009-11-13 20:46:56 -08:00

inet_sock.h

inet: rename some inet_sock fields

2009-10-18 18:52:53 -07:00

inet_timewait_sock.h

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

2009-10-27 01:03:26 -07:00

inetpeer.h

inetpeer: Optimize inet_getid()

2009-11-13 20:46:58 -08:00

ip6_checksum.h

…

ip6_fib.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

ip6_route.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

ip6_tunnel.h

…

ip_fib.h

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

2009-11-06 00:55:55 -08:00

ip_vs.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

ip.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

ipcomp.h

…

ipconfig.h

…

ipip.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

ipv6.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

ipx.h

…

iw_handler.h

net: cleanup include/net

2009-11-04 05:06:25 -08: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

mac80211: request TX status where needed

2009-11-19 11:08:56 -05:00

mip6.h

…

ndisc.h

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

neighbour.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

net_namespace.h

rtnetlink: speedup rtnl_dump_ifinfo()

2009-10-24 06:13:17 -07:00

netdma.h

…

netevent.h

…

netlabel.h

…

netlink.h

netlink: constify nlmsghdr arguments

2009-08-25 16:07:40 +02:00

netrom.h

…

nexthop.h

…

nl802154.h

ieee802154: add support for channel pages from IEEE 802.15.4-2006

2009-08-19 23:08:22 +04:00

p8022.h

…

pkt_cls.h

net: rename skb->iif to skb->skb_iif

2009-11-20 15:35:04 -08:00

pkt_sched.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

protocol.h

net: drop capability from protocol definitions

2009-11-05 21:40:17 -08:00

psnap.h

…

raw.h

…

rawv6.h

…

red.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

regulatory.h

…

request_sock.h

…

rose.h

…

route.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

rtnetlink.h

net: Support specifying the network namespace upon device creation.

2009-11-08 00:53:51 -08:00

sch_generic.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

scm.h

net: cleanup include/net

2009-11-04 05:06:25 -08:00

slhc_vj.h

…

snmp.h

…

sock.h

udp: secondary hash on (local port, local address)

2009-11-08 20:53:06 -08:00

stp.h

…

tcp_states.h

…

tcp.h

net: TCP_MSS_DEFAULT, TCP_MSS_DESIRED

2009-11-13 20:38:48 -08:00

timewait_sock.h

…

transp_v6.h

inet: inet_connection_sock_af_ops const

2009-09-02 01:03:49 -07:00

udp.h

udp: bind() optimisation

2009-11-10 20:54:38 -08:00

udplite.h

…

wext.h

wext: refactor

2009-10-07 16:39:43 -04:00

wimax.h

wimax/i2400m: clarify and fix i2400m->{ready,updown}

2009-10-19 15:56:07 +09:00

wpan-phy.h

ieee802154: add support for creation/removal of logic interfaces

2009-11-06 14:32:24 +03:00

x25.h

X25: Move SYSCTL ifdefs into header

2009-11-29 00:24:59 -08:00

x25device.h

…

xfrm.h

xfrm: Store aalg in xfrm_state with a user specified truncation length

2009-11-25 15:48:38 -08:00