You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 038a5008b2 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits) [SKY2]: status polling loop (post merge) [NET]: Fix NAPI completion handling in some drivers. [TCP]: Limit processing lost_retrans loop to work-to-do cases [TCP]: Fix lost_retrans loop vs fastpath problems [TCP]: No need to re-count fackets_out/sacked_out at RTO [TCP]: Extract tcp_match_queue_to_sack from sacktag code [TCP]: Kill almost unused variable pcount from sacktag [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L [TCP]: Add bytes_acked (ABC) clearing to FRTO too [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2 [NETFILTER]: x_tables: add missing ip6t_modulename aliases [NETFILTER]: nf_conntrack_tcp: fix connection reopening [QETH]: fix qeth_main.c [NETLINK]: fib_frontend build fixes [IPv6]: Export userland ND options through netlink (RDNSS support) [9P]: build fix with !CONFIG_SYSCTL [NET]: Fix dev_put() and dev_hold() comments [NET]: make netlink user -> kernel interface synchronious [NET]: unify netlink kernel socket recognition [NET]: cleanup 3rd argument in netlink_sendskb ... Fix up conflicts manually in Documentation/feature-removal-schedule.txt and my new least favourite crap, the "mod_devicetable" support in the files include/linux/mod_devicetable.h and scripts/mod/file2alias.c. (The latter files seem to be explicitly _designed_ to get conflicts when different subsystems work with them - that have an absolutely horrid lack of subsystem separation!) Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		18 years ago
..
acpi	Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6	18 years ago
cpu	Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6	18 years ago
cpufreq	x86_64: move kernel/cpufreq	18 years ago
.gitignore	i386: move kernel	18 years ago
Makefile	x86_64: move kernel	18 years ago
Makefile_32	x86: sanitize pathes arch/x86/kernel/Makefile_32	18 years ago
Makefile_64	x86: sanitize pathes arch/x86/kernel/Makefile_64	18 years ago
alternative.c	i386: move kernel	18 years ago
aperture_64.c	x86_64: move kernel	18 years ago
apic_32.c	i386: move kernel	18 years ago
apic_64.c	x86_64: move kernel	18 years ago
apm_32.c	Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6	18 years ago
asm-offsets.c	i386: move kernel	18 years ago
asm-offsets_32.c	i386: move kernel	18 years ago
asm-offsets_64.c	x86_64: move kernel	18 years ago
audit_64.c	x86_64: move kernel	18 years ago
bootflag.c	i386: move kernel	18 years ago
bugs_64.c	x86_64: move kernel	18 years ago
cpuid.c	i386: move kernel	18 years ago
crash_32.c	i386: move kernel	18 years ago
crash_64.c	x86_64: move kernel	18 years ago
crash_dump_32.c	i386: move kernel	18 years ago
crash_dump_64.c	x86_64: move kernel	18 years ago
doublefault_32.c	i386: move kernel	18 years ago
e820_32.c	i386: move kernel	18 years ago
e820_64.c	x86_64: move kernel	18 years ago
early-quirks_64.c	x86_64: move kernel	18 years ago
early_printk.c	x86_64: move kernel	18 years ago
efi_32.c	i386: move kernel	18 years ago
efi_stub_32.S	i386: move kernel	18 years ago
entry_32.S	i386: move kernel	18 years ago
entry_64.S	x86_64: move kernel	18 years ago
genapic_64.c	x86_64: move kernel	18 years ago
genapic_flat_64.c	x86_64: move kernel	18 years ago
geode_32.c	i386: move kernel	18 years ago
head64.c	x86_64: move kernel	18 years ago
head_32.S	i386: move kernel	18 years ago
head_64.S	x86_64: move kernel	18 years ago
hpet_32.c	i386: move kernel	18 years ago
hpet_64.c	x86_64: move kernel	18 years ago
i386_ksyms_32.c	i386: move kernel	18 years ago
i387_32.c	i386: move kernel	18 years ago
i387_64.c	x86_64: move kernel	18 years ago
i8237.c	i386: move kernel	18 years ago
i8253_32.c	i386: move kernel	18 years ago
i8259_32.c	i386: move kernel	18 years ago
i8259_64.c	x86_64: move kernel	18 years ago
init_task_32.c	i386: move kernel	18 years ago
init_task_64.c	x86_64: move kernel	18 years ago
io_apic_32.c	i386: move kernel	18 years ago
io_apic_64.c	x86_64: move kernel	18 years ago
ioport_32.c	i386: move kernel	18 years ago
ioport_64.c	x86_64: move kernel	18 years ago
irq_32.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	18 years ago
irq_64.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	18 years ago
k8.c	x86_64: move kernel	18 years ago
kprobes_32.c	i386: move kernel	18 years ago
kprobes_64.c	x86_64: move kernel	18 years ago
ldt_32.c	i386: move kernel	18 years ago
ldt_64.c	x86_64: move kernel	18 years ago
machine_kexec_32.c	i386: move kernel	18 years ago
machine_kexec_64.c	x86_64: move kernel	18 years ago
mca_32.c	i386: move kernel	18 years ago
mce_64.c	x86_64: move kernel	18 years ago
mce_amd_64.c	x86_64: move kernel	18 years ago
mce_intel_64.c	x86_64: move kernel	18 years ago
microcode.c	i386: move kernel	18 years ago
module_32.c	i386: move kernel	18 years ago
module_64.c	x86_64: move kernel	18 years ago
mpparse_32.c	i386: move kernel	18 years ago
mpparse_64.c	x86_64: move kernel	18 years ago
msr.c	i386: move kernel	18 years ago
nmi_32.c	i386: move kernel	18 years ago
nmi_64.c	x86_64: move kernel	18 years ago
numaq_32.c	i386: move kernel	18 years ago
paravirt_32.c	i386: move kernel	18 years ago
pci-calgary_64.c	x86_64: move kernel	18 years ago
pci-dma_32.c	i386: move kernel	18 years ago
pci-dma_64.c	x86_64: move kernel	18 years ago
pci-gart_64.c	x86_64: move kernel	18 years ago
pci-nommu_64.c	x86_64: move kernel	18 years ago
pci-swiotlb_64.c	x86_64: move kernel	18 years ago
pcspeaker.c	i386: move kernel	18 years ago
pmtimer_64.c	x86_64: move kernel	18 years ago
process_32.c	i386: move kernel	18 years ago
process_64.c	x86_64: move kernel	18 years ago
ptrace_32.c	i386: move kernel	18 years ago
ptrace_64.c	x86_64: move kernel	18 years ago
quirks.c	i386: move kernel	18 years ago
reboot_32.c	Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6	18 years ago
reboot_64.c	x86_64: move kernel	18 years ago
reboot_fixups_32.c	i386: move kernel	18 years ago
relocate_kernel_32.S	i386: move kernel	18 years ago
relocate_kernel_64.S	x86_64: move kernel	18 years ago
scx200_32.c	i386: move kernel	18 years ago
setup64.c	x86_64: move kernel	18 years ago
setup_32.c	i386: move kernel	18 years ago
setup_64.c	x86_64: move kernel	18 years ago
sigframe_32.h	i386: move kernel	18 years ago
signal_32.c	i386: move kernel	18 years ago
signal_64.c	x86_64: move kernel	18 years ago
smp_32.c	i386: move kernel	18 years ago
smp_64.c	x86_64: move kernel	18 years ago
smpboot_32.c	i386: move kernel	18 years ago
smpboot_64.c	x86_64: move kernel	18 years ago
smpcommon_32.c	i386: move kernel	18 years ago
srat_32.c	i386: move kernel	18 years ago
stacktrace.c	x86_64: move kernel	18 years ago
summit_32.c	i386: move kernel	18 years ago
suspend_64.c	x86_64: move kernel	18 years ago
suspend_asm_64.S	x86_64: move kernel	18 years ago
sys_i386_32.c	i386: move kernel	18 years ago
sys_x86_64.c	x86_64: move kernel	18 years ago
syscall_64.c	i386/x86_64: move headers to include/asm-x86	18 years ago
syscall_table_32.S	i386: move kernel	18 years ago
sysenter_32.c	i386: move kernel	18 years ago
tce_64.c	x86_64: move kernel	18 years ago
time_32.c	i386: move kernel	18 years ago
time_64.c	x86_64: move kernel	18 years ago
topology.c	i386: move kernel	18 years ago
trampoline_32.S	i386: move kernel	18 years ago
trampoline_64.S	x86_64: move kernel	18 years ago
traps_32.c	i386: move kernel	18 years ago
traps_64.c	x86_64: move kernel	18 years ago
tsc_32.c	Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6	18 years ago
tsc_64.c	x86_64: move kernel	18 years ago
tsc_sync.c	x86_64: move kernel	18 years ago
verify_cpu_64.S	x86_64: move kernel	18 years ago
vm86_32.c	i386: move kernel	18 years ago
vmi_32.c	i386: move kernel	18 years ago
vmiclock_32.c	i386: move kernel	18 years ago
vmlinux.lds.S	i386: move kernel	18 years ago
vmlinux_32.lds.S	i386: move kernel	18 years ago
vmlinux_64.lds.S	x86_64: move kernel	18 years ago
vsmp_64.c	x86_64: move kernel	18 years ago
vsyscall-int80_32.S	i386: move kernel	18 years ago
vsyscall-note_32.S	i386: move kernel	18 years ago
vsyscall-sigreturn_32.S	i386: move kernel	18 years ago
vsyscall-sysenter_32.S	i386: move kernel	18 years ago
vsyscall_32.S	i386: move kernel	18 years ago
vsyscall_32.lds.S	i386: move kernel	18 years ago
vsyscall_64.c	x86_64: move kernel	18 years ago
x8664_ksyms_64.c	x86_64: move kernel	18 years ago