Trond Myklebust 34161db6b1 Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus ...

Conflicts:

	include/linux/sunrpc/xprt.h
	net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.

2006-12-07 15:48:15 -05:00

..

802

[NET]: Kill direct includes of asm/checksum.h

2006-12-02 21:22:59 -08:00

8021q

[PATCH] Finish annotations of struct vlan_ethhdr

2006-10-10 16:15:34 -07:00

appletalk

[PATCH] severing skbuff.h -> highmem.h

2006-12-04 02:00:29 -05:00

atm

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

2006-12-05 14:37:56 +00:00

ax25

[AX25]: Use kmemdup

2006-12-02 21:24:01 -08:00

bluetooth

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

2006-12-05 14:37:56 +00:00

bridge

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

2006-12-05 14:37:56 +00:00

core

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

2006-12-05 17:01:28 +00:00

dccp

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

2006-12-05 17:01:28 +00:00

decnet

[RTNETLINK]: Add rtnl_put_cacheinfo() to unify some code

2006-12-02 21:30:44 -08:00

econet

[NET]: Conversions from kmalloc+memset to k(z|c)alloc.

2006-07-21 14:51:30 -07:00

ethernet

[NET]: Kill direct includes of asm/checksum.h

2006-12-02 21:22:59 -08:00

ieee80211

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

2006-12-05 17:01:28 +00:00

ipv4

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

2006-12-05 17:01:28 +00:00

ipv6

[NETFILTER]: Mark old IPv4-only connection tracking scheduled for removal

2006-12-02 22:11:01 -08:00

ipx

[IPX]: Annotate and fix IPX checksum

2006-11-05 14:11:25 -08:00

irda

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

2006-12-05 17:01:28 +00:00

key

[IPSEC]: Add AF_KEY interface for encapsulation family.

2006-12-02 21:31:50 -08:00

lapb

[LAPB]: Fix windowsize check

2006-08-05 21:15:58 -07:00

llc

[LLC]: anotations

2006-12-02 21:21:23 -08:00

netfilter

[PATCH] severing skbuff.h -> mm.h

2006-12-04 02:00:34 -05:00

netlabel

NetLabel: convert to an extensibile/sparse category bitmap

2006-12-02 21:31:36 -08:00

netlink

[GENETLINK]: Add cmd dump completion.

2006-12-02 21:32:09 -08:00

netrom

[NETROM]: Use kmemdup

2006-12-02 21:24:02 -08:00

packet

[PATCH] severing skbuff.h -> highmem.h

2006-12-04 02:00:29 -05:00

rose

[ROSE] rose_add_loopback_node: propagate -E

2006-12-02 22:17:48 -08:00

rxrpc

[NET]: Kill direct includes of asm/checksum.h

2006-12-02 21:22:59 -08:00

sched

[PKT_SCHED] act_gact: division by zero

2006-12-02 21:32:11 -08:00

sctp

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

2006-12-05 14:37:56 +00:00

sunrpc

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

2006-12-07 15:48:15 -05:00

tipc

[TIPC]: Use kzalloc where appropriate

2006-12-02 21:30:21 -08:00

unix

[NET]: Annotate csum_partial() callers in net/*

2006-12-02 21:23:32 -08:00

wanrouter

Fix misc .c/.h comment typos

2006-11-30 05:24:39 +01:00

x25

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

xfrm

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

2006-12-05 17:01:28 +00:00

compat.c

[NET]: File descriptor loss while receiving SCM_RIGHTS

2006-10-11 23:59:48 -07:00

Kconfig

[NETFILTER]: remove the reference to ipchains from Kconfig

2006-12-02 21:31:35 -08:00

Makefile

[NetLabel]: core NetLabel subsystem

2006-09-22 14:53:34 -07:00

nonet.c

[PATCH] Make most file operations structs in fs/ const

2006-03-28 09:16:06 -08:00

socket.c

[NET]: The scheduled removal of the frame diverter.

2006-12-02 21:22:23 -08:00

sysctl_net.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

TUNABLE

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00