Thomas Gleixner 90889a635a Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core ...

Trivial conflict in arch/x86/Kconfig

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2013-02-04 11:03:03 +01:00

..

boot

Various urgent EFI fixes and some warning cleanups for v3.8

2013-01-30 14:43:05 -08:00

configs

…

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2012-12-15 12:35:19 -08:00

ia32

new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those

2012-12-19 18:07:41 -05:00

include

Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-01-31 17:10:36 +11:00

kernel

Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core

2013-02-04 11:03:03 +01:00

kvm

KVM: x86: use dynamic percpu allocations for shared msrs area

2013-01-08 12:51:56 -02:00

lguest

…

lib

X86: drivers: remove __dev* attributes.

2013-01-03 15:57:04 -08:00

math-emu

…

mm

Automatic NUMA Balancing V11

2012-12-16 15:18:08 -08:00

net

…

oprofile

…

pci

X86: drivers: remove __dev* attributes.

2013-01-03 15:57:04 -08:00

platform

Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-01-31 17:10:36 +11:00

power

…

realmode

Revert "x86, mm: Include the entire kernel memory map in trampoline_pgd"

2012-12-15 12:29:54 -08:00

syscalls

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-12-20 18:05:28 -08:00

tools

x86/boot: Fix minor fd leakage in tools/relocs.c

2013-01-27 10:24:28 -08:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-12-20 18:05:28 -08:00

vdso

Merge tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2012-12-13 15:31:08 -08:00

video

…

xen

Fixes:

2013-01-18 12:02:52 -08:00

.gitignore

…

Kbuild

…

Kconfig

Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core

2013-02-04 11:03:03 +01:00

Kconfig.cpu

…

Kconfig.debug

…

Makefile

md update for 3.8

2012-12-18 09:32:44 -08:00

Makefile_32.cpu

…

Makefile.um

…