Ingo Molnar eadb8a091b Merge branch 'linus' into tracing/hw-breakpoints ... Conflicts: arch/x86/Kconfig arch/x86/kernel/traps.c arch/x86/power/cpu.c arch/x86/power/cpu_32.c kernel/Makefile Semantic conflict: arch/x86/kernel/hw_breakpoint.c Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to put_cpu() in arch/x86/kernel/hw_breakpoint.c. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-17 12:56:49 +02:00
..
acpi	PM/ACPI/x86: Fix sparse warning in arch/x86/kernel/acpi/sleep.c	2009-06-12 21:32:29 +02:00
apic	Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-15 10:06:19 -07:00
cpu	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
.gitignore	…
Makefile	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
alternative.c	…
amd_iommu.c	…
amd_iommu_init.c	…
aperture_64.c	…
apm_32.c	PM core: rename suspend and resume functions	2009-06-12 21:32:31 +02:00
asm-offsets.c	…
asm-offsets_32.c	lguest: optimize by coding restore_flags and irq_enable in assembler.	2009-06-12 22:27:03 +09:30
asm-offsets_64.c	…
audit_64.c	…
bios_uv.c	…
bootflag.c	…
check.c	…
cpuid.c	Driver Core: x86: add nodename for cpuid and msr drivers.	2009-06-15 21:30:25 -07:00
crash.c	…
crash_dump_32.c	…
crash_dump_64.c	…
doublefault_32.c	…
ds.c	…
ds_selftest.c	…
ds_selftest.h	…
dumpstack.c	…
dumpstack.h	…
dumpstack_32.c	…
dumpstack_64.c	…
e820.c	…
early-quirks.c	…
early_printk.c	…
efi.c	…
efi_32.c	…
efi_64.c	…
efi_stub_32.S	…
efi_stub_64.S	…
entry_32.S	…
entry_64.S	Merge branch 'linus' into x86/mce3	2009-06-11 23:31:52 +02:00
ftrace.c	…
geode_32.c	…
head.c	…
head32.c	…
head64.c	…
head_32.S	…
head_64.S	…
hpet.c	…
hw_breakpoint.c	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
i386_ksyms_32.c	…
i387.c	…
i8237.c	…
i8253.c	time: move PIT_TICK_RATE to linux/timex.h	2009-06-16 19:47:27 -07:00
i8259.c	…
init_task.c	mm: consolidate init_mm definition	2009-06-16 19:47:28 -07:00
io_delay.c	…
ioport.c	…
irq.c	Merge branch 'linus' into x86/mce3	2009-06-11 23:31:52 +02:00
irq_32.c	…
irq_64.c	…
irqinit.c	Merge branch 'linus' into x86/mce3	2009-06-11 23:31:52 +02:00
k8.c	…
kdebugfs.c	…
kgdb.c	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
kprobes.c	…
kvm.c	Merge branch 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2009-06-11 10:03:30 -07:00
kvmclock.c	…
ldt.c	…
machine_kexec_32.c	…
machine_kexec_64.c	…
mca_32.c	…
mfgpt_32.c	…
microcode_amd.c	…
microcode_core.c	Driver Core: misc: add nodename support for misc devices.	2009-06-15 21:30:25 -07:00
microcode_intel.c	…
mmconf-fam10h_64.c	…
module.c	module: cleanup FIXME comments about trimming exception table entries.	2009-06-12 21:47:05 +09:30
mpparse.c	…
msr.c	Driver Core: x86: add nodename for cpuid and msr drivers.	2009-06-15 21:30:25 -07:00
olpc.c	…
paravirt-spinlocks.c	…
paravirt.c	…
paravirt_patch_32.c	…
paravirt_patch_64.c	…
pci-calgary_64.c	…
pci-dma.c	…
pci-gart_64.c	…
pci-nommu.c	…
pci-swiotlb.c	…
pcspeaker.c	…
pmtimer_64.c	…
probe_roms_32.c	…
process.c	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
process_32.c	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
process_64.c	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
ptrace.c	…
pvclock.c	…
quirks.c	…
reboot.c	…
reboot_fixups_32.c	…
relocate_kernel_32.S	…
relocate_kernel_64.S	…
rtc.c	…
scx200_32.c	…
setup.c	x86: handle initrd that extends into unusable memory	2009-06-11 15:19:13 -07:00
setup_percpu.c	…
signal.c	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
smp.c	Merge branch 'linus' into x86/mce3	2009-06-11 23:31:52 +02:00
smpboot.c	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
stacktrace.c	x86: add save_stack_trace_bp() for tracing from a specific stack frame	2009-06-12 23:01:05 +02:00
step.c	…
sys_i386_32.c	…
sys_x86_64.c	…
syscall_64.c	…
syscall_table_32.S	…
tce_64.c	…
test_nx.c	…
test_rodata.c	…
time_32.c	…
time_64.c	…
tlb_uv.c	…
tls.c	…
tls.h	…
topology.c	…
trampoline.c	…
trampoline_32.S	…
trampoline_64.S	…
traps.c	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
tsc.c	time: move PIT_TICK_RATE to linux/timex.h	2009-06-16 19:47:27 -07:00
tsc_sync.c	…
uv_irq.c	…
uv_sysfs.c	…
uv_time.c	…
verify_cpu_64.S	…
visws_quirks.c	…
vm86_32.c	…
vmi_32.c	…
vmiclock_32.c	…
vmlinux.lds.S	x86: Provide _sdata in the vmlinux.lds.S file	2009-06-12 09:21:33 +02:00
vsmp_64.c	…
vsyscall_64.c	…
x8664_ksyms_64.c	…
xsave.c	…