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

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

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

..

acpi

Remove obsolete #include <linux/config.h>

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

cpufreq

Linux-2.6.12-rc2

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

aperture.c

[PATCH] x86: Allow disabling early pci scans with pci=noearly or disallowing conf1

2006-09-26 10:52:41 +02:00

apic.c

[PATCH] x86_64 irq_regs fix

2006-10-06 13:36:52 -07:00

asm-offsets.c

[CRYPTO] all: Pass tfm instead of ctx to algorithms

2006-06-26 17:34:39 +10:00

audit.c

[PATCH] audit: AUDIT_PERM support

2006-09-11 13:32:30 -04:00

crash_dump.c

[PATCH] kdump: read previous kernel's memory

2006-01-10 08:01:28 -08:00

crash.c

[PATCH] Remove all ifdefs for local/io apic

2006-09-26 10:52:29 +02:00

e820.c

[PATCH] x86-64: setup saved_max_pfn correctly (kdump)

2006-11-14 16:57:46 +01:00

early_printk.c

[PATCH] x86_64: fix 'earlyprintk=...,keep' regression

2006-11-28 10:58:21 -08:00

early-quirks.c

[PATCH] x86: Add acpi_user_timer_override option for Asus boards

2006-11-14 16:57:46 +01:00

entry.S

[PATCH] x86: Revert new unwind kernel stack termination

2006-10-21 18:37:02 +02:00

functionlist

[NET]: make skb_release_data() static

2006-06-29 16:58:30 -07:00

genapic_cluster.c

[PATCH] x86_64 irq: Allocate a vector across all cpus for genapic_flat.

2006-10-08 12:24:02 -07:00

genapic_flat.c

[PATCH] x86-64: Put more than one cpu in TARGET_CPUS

2006-10-21 18:37:02 +02:00

genapic.c

Remove obsolete #include <linux/config.h>

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

head64.c

[PATCH] Remove need for early lockdep init

2006-09-26 10:52:32 +02:00

head.S

[PATCH] Reload CS when startup_64 is used.

2006-09-26 10:52:38 +02:00

i387.c

Remove obsolete #include <linux/config.h>

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

i8259.c

[PATCH] genirq: clean up irq-flow-type naming

2006-10-17 08:18:45 -07:00

init_task.c

[PATCH] nsproxy: move init_nsproxy into kernel/nsproxy.c

2006-10-02 07:57:20 -07:00

io_apic.c

[PATCH] x86-64: Fix warning in io_apic.c

2006-11-28 20:12:59 +01:00

ioport.c

[PATCH] x86-64 TIF flags for debug regs and io bitmap in ctxsw

2006-09-26 10:52:28 +02:00

irq.c

[PATCH] genirq: clean up irq-flow-type naming

2006-10-17 08:18:45 -07:00

k8.c

[PATCH] x86_64: Clean and enhance up K8 northbridge access code

2006-06-26 10:48:15 -07:00

kprobes.c

[PATCH] kretprobe spinlock deadlock patch

2006-10-02 07:57:16 -07:00

ldt.c

Linux-2.6.12-rc2

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

machine_kexec.c

[PATCH] Avoid overwriting the current pgd (V4, x86_64)

2006-09-26 10:52:38 +02:00

Makefile

[PATCH] x86: Refactor thermal throttle processing

2006-09-26 10:52:42 +02:00

mce_amd.c

[PATCH] cpu hotplug: use hotplug version of registration in late inits

2006-07-31 13:28:39 -07:00

mce_intel.c

[PATCH] x86: Add a cumulative thermal throttle event counter.

2006-09-26 10:52:42 +02:00

mce.c

WorkStruct: Pass the work_struct pointer instead of context data

2006-11-22 14:55:48 +00:00

module.c

[PATCH] x86_64: x86_64 version of the smp alternative patch.

2006-06-26 10:48:14 -07:00

mpparse.c

[PATCH] genirq: x86_64 irq: Kill irq compression

2006-10-04 07:55:29 -07:00

nmi.c

[PATCH] x86: Clean up x86 NMI sysctls

2006-09-30 01:47:55 +02:00

pci-calgary.c

[PATCH] x86-64: increase PHB1 split transaction timeout

2006-10-22 00:41:15 +02:00

pci-dma.c

[PATCH] Document iommu=panic

2006-09-30 01:47:55 +02:00

pci-gart.c

[PATCH] remove superflous BUG_ON's in nommu and gart

2006-09-26 10:52:32 +02:00

pci-nommu.c

[PATCH] remove superflous BUG_ON's in nommu and gart

2006-09-26 10:52:32 +02:00

pci-swiotlb.c

[PATCH] Move valid_dma_direction() from x86_64 to generic code

2006-09-29 09:18:10 -07:00

pmtimer.c

[PATCH] make pmtmr_ioport __read_mostly

2006-06-26 09:58:21 -07:00

process.c

[PATCH] i386/x86_64: ACPI cpu_idle_wait() fix

2006-11-17 08:20:09 -08:00

ptrace.c

[PATCH] i386/x86-64: rename is_at_popf(), add iret to tests and fix

2006-09-26 10:52:33 +02:00

reboot.c

[PATCH] x86_64: Move export symbols to their C functions

2006-06-26 10:48:22 -07:00

relocate_kernel.S

[PATCH] Avoid overwriting the current pgd (V4, x86_64)

2006-09-26 10:52:38 +02:00

setup64.c

[PATCH] Don't leak NT bit into next task

2006-09-26 10:52:41 +02:00

setup.c

[PATCH] Use ARRAY_SIZE in setup.c

2006-09-30 01:47:55 +02:00

signal.c

[PATCH] Remove all traces of signal number conversion

2006-09-26 10:52:41 +02:00

smp.c

[PATCH] x86-64: Fix vgetcpu when CONFIG_HOTPLUG_CPU is disabled

2006-11-14 16:57:46 +01:00

smpboot.c

WorkStruct: Pass the work_struct pointer instead of context data

2006-11-22 14:55:48 +00:00

stacktrace.c

[PATCH] Merge stacktrace and show_trace

2006-09-26 10:52:34 +02:00

suspend_asm.S

[PATCH] Change the name of pagedir_nosave

2006-09-26 08:49:01 -07:00

suspend.c

Remove obsolete #include <linux/config.h>

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

sys_x86_64.c

[PATCH] namespaces: utsname: switch to using uts namespaces

2006-10-02 07:57:21 -07:00

syscall.c

Remove obsolete #include <linux/config.h>

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

tce.c

Remove all inclusions of <linux/config.h>

2006-10-04 03:38:54 -04:00

time.c

WorkStruct: Pass the work_struct pointer instead of context data

2006-11-22 14:55:48 +00:00

trampoline.S

[PATCH] Fix gdt table size in trampoline.S

2006-09-26 10:52:32 +02:00

traps.c

[PATCH] x86-64: Use stricter in process stack check for unwinder

2006-11-28 20:12:59 +01:00

vmlinux.lds.S

[PATCH] x86_64: Align data segment to PAGE_SIZE boundary

2006-11-21 10:31:21 +01:00

vsmp.c

[PATCH] Fix build breakage with CONFIG_X86_VSMP

2006-10-12 12:25:27 -07:00

vsyscall.c

[PATCH] x86-64: Fix vsyscall.c compilation on UP

2006-11-16 13:57:03 -08:00

x8664_ksyms.c

Remove all inclusions of <linux/config.h>

2006-10-04 03:38:54 -04:00