Linus Torvalds a4c12d6c5d Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (353 commits) [IPV6] ADDRCONF: Mobile IPv6 Home Address support. [IPV6] ADDRCONF: Allow non-DAD'able addresses. [IPV6] NDISC: Fix is_router flag setting. [IPV6] ADDRCONF: Convert addrconf_lock to RCU. [IPV6] NDISC: Add proxy_ndp sysctl. [IPV6] NDISC: Set per-entry is_router flag in Proxy NA. [IPV6] NDISC: Avoid updating neighbor cache for proxied address in receiving NA. [IPV6]: Don't forward packets to proxied link-local address. [IPV6] NDISC: Handle NDP messages to proxied addresses. [NETFILTER]: PPTP conntrack: fix another GRE keymap leak [NETFILTER]: PPTP conntrack: fix GRE keymap leak [NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types [NETFILTER]: PPTP conntrack: check call ID before changing state [NETFILTER]: PPTP conntrack: clean up debugging cruft [NETFILTER]: PPTP conntrack: consolidate header parsing [NETFILTER]: PPTP conntrack: consolidate header size checks [NETFILTER]: PPTP conntrack: simplify expectation handling [NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers [NETFILTER]: PPTP conntrack: fix header definitions [NETFILTER]: PPTP conntrack: remove more dead code ...		2006-09-23 16:49:31 -07:00
..
acpi	Pull acpi_os_allocate into test branch	2006-07-10 02:39:47 -04:00
asm-alpha	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
asm-arm	[ARM] 3815/1: headers_install support for ARM	2006-09-18 16:28:50 +01:00
asm-arm26	[PATCH] remove set_wmb - arch removal	2006-07-14 21:56:14 -07:00
asm-cris	[PATCH] remove set_wmb - arch removal	2006-07-14 21:56:14 -07:00
asm-frv	[PATCH] remove set_wmb - arch removal	2006-07-14 21:56:14 -07:00
asm-generic	[PATCH] fix missing ifdefs in syscall classes hookup for generic targets	2006-09-22 17:48:56 -07:00
asm-h8300	[PATCH] remove set_wmb - arch removal	2006-07-14 21:56:14 -07:00
asm-i386	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
asm-ia64	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
asm-m32r	[PATCH] remove set_wmb - arch removal	2006-07-14 21:56:14 -07:00
asm-m68k	[PATCH] Fix 'make headers_check' on ia64	2006-09-19 07:59:59 -07:00
asm-m68knommu	[PATCH] remove set_wmb - arch removal	2006-07-14 21:56:14 -07:00
asm-mips	[PATCH] headers_check: fix userspace build of asm-mips/page.h	2006-09-13 07:32:16 -07:00
asm-parisc	[PATCH] headers_check: Clean up asm-parisc/page.h for user headers	2006-09-19 07:59:59 -07:00
asm-powerpc	Merge git://git.infradead.org/~dwmw2/hdroneline	2006-09-22 12:56:22 -07:00
asm-ppc	[PATCH] #elif that should've been #elif defined	2006-09-23 11:34:43 -07:00
asm-s390	Merge git://git.infradead.org/~dwmw2/hdroneline	2006-09-22 12:56:22 -07:00
asm-sh	[PATCH] sh: fix FPN_START typo	2006-09-08 10:22:50 -07:00
asm-sh64	sh64: Use generic BUG_ON()/WARN_ON().	2006-09-12 14:38:23 +09:00
asm-sparc	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
asm-sparc64	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
asm-um	Merge git://git.infradead.org/hdrinstall-2.6	2006-07-04 12:55:45 -07:00
asm-v850	[PATCH] remove set_wmb - arch removal	2006-07-14 21:56:14 -07:00
asm-x86_64	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
asm-xtensa	[PATCH] remove set_wmb - arch removal	2006-07-14 21:56:14 -07:00
crypto	[CRYPTO] digest: Added user API for new hash type	2006-09-21 11:46:17 +10:00
keys	[PATCH] keys: discard the contents of a key on revocation	2006-06-26 09:58:18 -07:00
linux	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2006-09-23 16:49:31 -07:00
math-emu
media	V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install	2006-09-10 13:45:55 -03:00
mtd	Merge git://git.infradead.org/~dwmw2/hdroneline	2006-09-22 12:56:22 -07:00
net	[IPV6] ADDRCONF: Mobile IPv6 Home Address support.	2006-09-22 15:20:29 -07:00
pcmcia
rdma	IB/sa: fix ib_sa_selector names	2006-09-22 15:22:55 -07:00
rxrpc
scsi	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
sound	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
video	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
Kbuild	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00