David Woodhouse e758936e02 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	include/asm-x86/statfs.h

2008-10-13 17:13:56 +01:00

..

boot

Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2

2008-10-12 15:50:02 +02:00

configs

Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2

2008-10-12 15:50:02 +02:00

crypto

crypto: crc32c - Use Intel CRC32 instruction

2008-08-29 15:49:50 +10:00

ia32

Merge branch 'linus' into x86/signal

2008-10-12 12:49:27 +02:00

kernel

Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2

2008-10-12 15:50:02 +02:00

kvm

Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

2008-10-11 20:23:20 +02:00

lguest

Merge branch 'linus' into x86/x2apic

2008-08-11 11:19:20 +02:00

lib

Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

2008-10-11 20:23:20 +02:00

mach-default

Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core

2008-08-14 14:58:22 +02:00

mach-generic

x86: move dir es7000 to es7000_32.c

2008-09-04 08:08:53 -07:00

mach-rdc321x

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

mach-voyager

kernel/cpu.c: create a CPU_STARTING cpu_chain notifier

2008-09-08 19:25:24 +02:00

math-emu

…

mm

Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2

2008-10-12 15:50:02 +02:00

oprofile

Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1

2008-10-06 18:17:07 +02:00

pci

Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

2008-10-11 20:23:20 +02:00

power

Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

2008-10-11 20:23:20 +02:00

vdso

Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus

2008-07-21 16:37:17 +02:00

video

…

xen

Merge branch 'linus' into x86/xen

2008-10-12 12:37:32 +02:00

Kconfig

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

2008-10-13 17:13:56 +01:00

Kconfig.cpu

x86: make processor type select depend on CONFIG_EMBEDDED

2008-10-12 15:44:07 +02:00

Kconfig.debug

x86: usb debug port early console, fix

2008-07-26 17:32:30 +02:00

Makefile

x86, RDC321x: add to mach-default

2008-07-26 13:51:46 +02:00

Makefile_32.cpu

x86: prevent binutils from being "smart" and generating NOPLs for us

2008-09-09 11:52:41 -07:00