Linus Torvalds 31083eba37 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits) [NETFILTER]: xt_time should not assume CONFIG_KTIME_SCALAR [NET]: Move unneeded data to initdata section. [NET]: Cleanup pernet operation without CONFIG_NET_NS [TEHUTI]: Fix incorrect usage of strncat in bdx_get_drvinfo() [MYRI_SBUS]: Prevent that myri_do_handshake lies about ticks. [NETFILTER]: bridge: fix double POSTROUTING hook invocation [NETFILTER]: Consolidate nf_sockopt and compat_nf_sockopt [NETFILTER]: nf_nat: fix memset error [INET]: Use list_head-s in inetpeer.c [IPVS]: Remove unused exports. [NET]: Unexport sysctl_{r,w}mem_max. [TG3]: Update version to 3.86 [TG3]: MII => TP [TG3]: Add A1 revs [TG3]: Increase the PCI MRRS [TG3]: Prescaler fix [TG3]: Limit 5784 / 5764 to MAC LED mode [TG3]: Disable GPHY autopowerdown [TG3]: CPMU adjustments for loopback tests [TG3]: Fix nvram selftest failures ...		2007-11-13 09:04:48 -08:00
..
acpi	ACPI: Fan: Drop force_power_state acpi_device option	2007-10-25 16:31:31 -04:00
asm-alpha	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-arm	[ARM] 4644/2: fix flush_kern_tlb_range() in module space	2007-11-08 10:07:14 +00:00
asm-avr32	AVR32: Fix sg_page breakage	2007-10-24 10:16:02 +02:00
asm-blackfin	Blackfin arch: use a less common define name in BF549	2007-10-30 12:04:53 +08:00
asm-cris	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-frv	frv: Remove bogus NO_IRQ = -1 define	2007-11-09 15:11:44 -08:00
asm-generic	Linux Kernel Markers	2007-10-19 11:53:54 -07:00
asm-h8300	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-ia64	[IA64] Update printing of feature set bits	2007-11-09 13:05:30 -08:00
asm-m32r	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-m68k	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-m68knommu	m68knommu: fix pread/pwrite defines	2007-11-05 15:12:33 -08:00
asm-mips	Use i8253.c lock for PC speaker on MIPS, too.	2007-11-02 19:39:18 -07:00
asm-parisc	parisc: fix sg_page() fallout	2007-10-23 09:49:31 +02:00
asm-powerpc	[POWERPC] Avoid unpaired stwcx. on some processors	2007-11-13 16:22:43 +11:00
asm-ppc	ppc: fix AT_VECTOR_SIZE on arch/ppc	2007-10-22 19:18:54 -07:00
asm-s390	Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6	2007-10-22 19:23:34 -07:00
asm-sh	sh: remove dead config symbols from SH code	2007-11-09 04:45:29 +09:00
asm-sh64	sh: remove PTRACE_O_TRACESYSGOOD from asm/ptrace.h	2007-11-07 11:13:54 +09:00
asm-sparc	[SPARC32]: __inline__ --> inline	2007-10-27 00:17:01 -07:00
asm-sparc64	[SPARC64]: Use "is_power_of_2" macro for simplicity.	2007-11-07 02:24:33 -08:00
asm-um	x86 merge fallout: uml	2007-10-29 07:41:32 -07:00
asm-v850	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
asm-x86	x86: fix taking DNA during 64bit sigreturn	2007-11-12 11:09:33 -08:00
asm-xtensa	xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it	2007-10-24 13:28:40 +02:00
crypto
keys	KEYS: Make request_key() and co fundamentally asynchronous	2007-10-17 08:42:57 -07:00
linux	[NET]: Add the helper kernel_sock_shutdown()	2007-11-12 18:10:39 -08:00
math-emu
media	[PATCH] Fix breakage after SG cleanups	2007-10-23 12:02:39 -07:00
mtd
net	[NET]: Move unneeded data to initdata section.	2007-11-13 03:23:50 -08:00
pcmcia
rdma	cleanup asm/scatterlist.h includes	2007-11-02 08:47:06 +01:00
rxrpc
scsi	SCSI: add asynchronous event notification API	2007-11-03 22:23:02 -04:00
sound	[ALSA] version 1.0.15	2007-10-23 08:09:20 +02:00
video	Make asm-x86/bootparam.h includable from userspace.	2007-10-23 15:49:47 +10:00
xen
Kbuild	do not export /usr/include/scsi in make headers_install	2007-10-17 08:42:52 -07:00