Linus Torvalds 3668805a54 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits) [IPSEC] flow: reorder "struct flow_cache_entry" and remove SLAB_HWCACHE_ALIGN [DECNET] ROUTE: remove unecessary alignment [IPSEC]: Add support for aes-ctr. [ISDN]: fix section mismatch warning in enpci_card_msg [TIPC]: declare proto_ops structures as 'const'. [TIPC]: Kill unused static inline (x5) [TC]: oops in em_meta [IPV6] Minor cleanup: remove unused definitions in net/ip6_fib.h [IPV6] Minor clenup: remove two unused definitions in net/ip6_route.h [AF_IUCV]: defensive programming of iucv_callback_txdone [AF_IUCV]: broken send_skb_q results in endless loop [IUCV]: wrong irq-disabling locking at module load time [CAN]: Minor clean-ups [CAN]: Move proto_{,un}register() out of spin-locked region [CAN]: Clean up module auto loading [IPSEC] flow: Remove an unnecessary ____cacheline_aligned [IPV4]: route: fix crash ip_route_input [NETFILTER]: xt_iprange: add missing #include [NETFILTER]: xt_iprange: fix typo in address family [NETFILTER]: nf_conntrack: fix ct_extend ->move operation ...		2008-02-08 09:27:06 -08:00
..
acpi	Merge branches 'release' and 'fluff' into release	2008-02-07 03:38:22 -05:00
asm-alpha	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-arm	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-avr32	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-blackfin	asm-*/posix_types.h: scrub __GLIBC__	2008-02-08 09:22:34 -08:00
asm-cris	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-frv	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-generic	asm-generic: remove fastcall	2008-02-08 09:22:31 -08:00
asm-h8300	avoid overflows in kernel/time.c	2008-02-08 09:22:39 -08:00
asm-ia64	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-m32r	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-m68k	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-m68knommu	avoid overflows in kernel/time.c	2008-02-08 09:22:39 -08:00
asm-mips	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-mn10300	mn10300: add the MN10300/AM33 architecture to the kernel	2008-02-08 09:22:30 -08:00
asm-parisc	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-powerpc	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-ppc	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-s390	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-sh	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-sparc	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-sparc64	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-um	uml: x86_64 should copy %fs during fork	2008-02-08 09:22:43 -08:00
asm-v850	avoid overflows in kernel/time.c	2008-02-08 09:22:39 -08:00
asm-x86	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
asm-xtensa	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
crypto	[CRYPTO] api: Include sched.h for cond_resched in scatterwalk.h	2008-01-11 08:16:59 +11:00
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-02-08 09:27:06 -08:00
math-emu
media	include/media/: Spelling fixes	2008-02-03 17:19:47 +02:00
mtd	Merge git://git.infradead.org/~dedekind/ubi-2.6	2008-02-03 22:07:40 +11:00
net	[TIPC]: Kill unused static inline (x5)	2008-02-07 18:17:13 -08:00
pcmcia	pcmcia: replace kio_addr_t with unsigned int everywhere	2008-02-05 09:44:08 -08:00
rdma	RDMA/cma: add support for rdma_migrate_id()	2008-01-25 14:15:32 -08:00
rxrpc
scsi	[SCSI] Small cleanups for scsi_host.h	2008-02-07 18:02:43 -06:00
sound	[ALSA] version 1.0.16rc2	2008-01-31 17:40:18 +01:00
video	atmel_lcdfb: backlight control	2008-02-06 10:41:16 -08:00
xen	x86: page.h: make pte_t a union to always include	2008-01-30 13:32:57 +01:00
Kbuild