Harvey Harrison a08546001c x86: pvclock: fix shadowed variable warning ...

arch/x86/kernel/pvclock.c:102:6: warning: symbol 'tsc_khz' shadows an earlier one
include/asm/tsc.h:18:21: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Avi Kivity <avi@redhat.com>

2008-10-15 14:25:14 +02: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

x86: merge winchip-2 and winchip-2a cpu choices

2008-10-13 10:22:48 +02:00

crypto

crypto: crc32c - Use Intel CRC32 instruction

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

ia32

x86-64: slightly stream-line 32-bit syscall entry code

2008-10-13 10:19:54 +02:00

kernel

x86: pvclock: fix shadowed variable warning

2008-10-15 14:25:14 +02:00

kvm

KVM: don't enter guest after SIPI was received by a CPU

2008-10-15 14:25:09 +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: check dsdt before find oem table for es7000, v2

2008-10-13 10:21:07 +02: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

x86: coding style fixes to arch/x86/math-emu/reg_constant

2008-06-18 15:00:13 +02:00

mm

x86: change early_ioremap to use slots instead of nesting

2008-10-13 10:34:23 +02:00

oprofile

Merge branch 'linus' into oprofile-v2

2008-10-13 11:05:51 +02:00

pci

Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4

2008-10-13 14:18:42 +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

x86: video/fbdev.c: add MODULE_LICENSE

2008-05-04 20:04:46 +02:00

xen

x86: paravirt: factor out cpu_khz to common code

2008-10-15 10:15:17 +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: adjust dependencies for CONFIG_X86_CMOV

2008-10-13 10:33:50 +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: merge winchip-2 and winchip-2a cpu choices

2008-10-13 10:22:48 +02:00