Jeff Garzik 28eb177dfa Merge branch 'master' into upstream ...

Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c

2006-09-22 20:10:23 -04:00

..

bluetooth

[Bluetooth] Use real devices for host controllers

2006-07-03 19:54:02 -07:00

irda

[PATCH] irq-flags: drivers/net: Use the new IRQF_ constants

2006-07-02 13:58:51 -07:00

netfilter

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

sctp

[SCTP]: Use HMAC template and hash interface

2006-09-21 11:46:19 +10:00

tc_act

[NETFILTER]: futher {ip,ip6,arp}_tables unification

2006-03-22 13:56:56 -08:00

tipc

[TIPC]: Corrected potential misuse of tipc_media_addr structure.

2006-06-25 23:38:29 -07:00

act_api.h

[PKT_SCHED]: Convert tc action functions to single skb pointers

2006-01-09 14:16:08 -08:00

act_generic.h

…

addrconf.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

af_unix.h

[AF_UNIX]: Kernel memory leak fix for af_unix datagram getpeersec patch

2006-08-02 14:12:06 -07:00

ah.h

[IPSEC]: Use HMAC template and hash interface

2006-09-21 11:46:18 +10:00

arp.h

[IPV4]: Possible cleanups.

2006-04-14 15:00:20 -07:00

atmclip.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ax25.h

[AX.25]: Reference counting for AX.25 routes.

2006-07-03 19:30:18 -07:00

checksum.h

…

compat.h

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

datalink.h

…

dn_dev.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_fib.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_neigh.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_nsp.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_route.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dsfield.h

…

dst.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

esp.h

[IPSEC]: Use HMAC template and hash interface

2006-09-21 11:46:18 +10:00

flow.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

gen_stats.h

…

genetlink.h

[PATCH] per-task-delay-accounting: utilities for genetlink usage

2006-07-14 21:53:56 -07:00

icmp.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ieee80211_crypt.h

[PATCH] ieee80211: Add TKIP crypt->build_iv

2006-01-27 17:08:07 -05:00

ieee80211_radiotap.h

[PATCH] ieee80211: Added ieee80211_radiotap.h

2005-09-21 23:03:55 -04:00

ieee80211.h

[PATCH] ieee80211: Make ieee80211_rx_any usable

2006-07-27 16:17:28 -04:00

ieee80211softmac_wx.h

[PATCH] softmac: add SIOCSIWMLME

2006-04-24 16:15:58 -04:00

ieee80211softmac.h

[PATCH] softmac: export highest_supported_rate function

2006-07-27 16:17:28 -04:00

if_inet6.h

[IPV6]: ADDRCONF: Use our standard algorithm for randomized ifid.

2006-03-20 16:54:09 -08:00

inet6_connection_sock.h

[IPV6]: Generalise some functions

2006-01-03 13:10:46 -08:00

inet6_hashtables.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

inet_common.h

[NET]: move struct proto_ops to const

2006-01-03 13:11:15 -08:00

inet_connection_sock.h

[ICSK] compat: Introduce inet_csk_compat_[gs]etsockopt

2006-03-20 22:46:16 -08:00

inet_ecn.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

inet_hashtables.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

inet_sock.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

inet_timewait_sock.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-05-06 19:59:18 +01:00

inetpeer.h

[IPV4]: Safer reassembly

2006-01-03 13:10:31 -08:00

ip6_checksum.h

…

ip6_fib.h

…

ip6_route.h

[IPV6]: Audit all ip6_dst_lookup/ip6_dst_store calls

2006-08-02 13:38:14 -07:00

ip6_tunnel.h

…

ip_fib.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ip_mp_alg.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ip_vs.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ip.h

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

ipcomp.h

[CRYPTO] users: Use crypto_comp and crypto_has_*

2006-09-21 11:46:22 +10:00

ipconfig.h

…

ipip.h

…

ipv6.h

[IPV6]: Audit all ip6_dst_lookup/ip6_dst_store calls

2006-08-02 13:38:14 -07:00

ipx.h

…

iw_handler.h

[PATCH] WE-20 for kernel 2.6.16

2006-03-23 07:12:57 -05:00

lapb.h

…

llc_c_ac.h

…

llc_c_ev.h

…

llc_c_st.h

…

llc_conn.h

[PATCH] gfp flags annotations - part 1

2005-10-08 15:00:57 -07:00

llc_if.h

[LLC]: add multicast support for datagrams

2006-06-17 21:26:08 -07:00

llc_pdu.h

[LLC]: Fix typo

2005-11-14 21:58:18 -08:00

llc_s_ac.h

…

llc_s_ev.h

…

llc_s_st.h

…

llc_sap.h

[LLC]: Fix the accept path

2005-09-22 07:57:21 -03:00

llc.h

[LLC]: llc_mac_hdr_init const arguments

2006-03-20 22:59:36 -08:00

ndisc.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

neighbour.h

[NEIGH]: Fix IP-over-ATM and ARP interaction.

2006-05-12 14:56:08 -07:00

netdma.h

[NET]: Fix more per-cpu typos

2006-08-02 15:02:31 -07:00

netevent.h

[NET]: Network Event Notifier Mechanism.

2006-08-02 13:38:20 -07:00

netlink.h

[NETLINK]: Generic netlink receive queue processor

2005-11-10 02:26:40 +01:00

netrom.h

[NETROM]: Eleminate HZ from NET/ROM kernel interfaces

2006-05-03 23:27:47 -07:00

p8022.h

…

pkt_act.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

pkt_cls.h

…

pkt_sched.h

[PKT_SCHED]: Fix regression in PSCHED_TADD{,2}.

2006-07-24 12:44:23 -07:00

protocol.h

[NET] gso: Fix up GSO packets with broken checksums

2006-07-08 13:34:56 -07:00

psnap.h

…

raw.h

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

rawv6.h

…

red.h

[PKT_SCHED] RED: Fix overflow in calculation of queue average

2006-08-04 22:59:51 -07:00

request_sock.h

[NET]: drop duplicate assignment in request_sock

2006-03-26 17:39:55 -08:00

rose.h

[ROSE]: Eleminate HZ from ROSE kernel interfaces

2006-05-03 23:28:20 -07:00

route.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

sch_generic.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

scm.h

[AF_UNIX]: Kernel memory leak fix for af_unix datagram getpeersec patch

2006-08-02 14:12:06 -07:00

slhc_vj.h

…

snmp.h

…

sock.h

[PATCH] lockdep: annotate sk_locks

2006-07-03 15:27:10 -07:00

syncppp.h

[PATCH] drivers/net/wan/: possible cleanups

2005-09-14 08:36:54 -04:00

tcp_ecn.h

[IPV6]: Added GSO support for TCPv6

2006-06-30 14:12:10 -07:00

tcp_states.h

[TCP]: Move the TCPF_ enum to tcp_states.h

2006-01-03 13:10:57 -08:00

tcp.h

[TCP]: SNMPv2 tcpAttemptFails counter error

2006-08-02 13:38:19 -07:00

timewait_sock.h

[TWSK]: Introduce struct timewait_sock_ops

2006-01-03 13:10:54 -08:00

transp_v6.h

[ICSK]: Rename struct tcp_func to struct inet_connection_sock_af_ops

2006-01-03 13:10:38 -08:00

udp.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

x25.h

[X25]: allow ITU-T DTE facilities for x25

2006-03-22 00:01:31 -08:00

x25device.h

[X25]: Restore skb->dev setting in x25_type_trans().

2006-04-09 22:37:18 -07:00

xfrm.h

[IPSEC]: Use HMAC template and hash interface

2006-09-21 11:46:18 +10:00