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

Merge remote-tracking branch 'agust/next' into next

2012-12-18 10:22:27 +11:00

configs

powerpc/pseries: Double NR_CPUS in defconfig

2012-11-15 12:59:17 +11:00

include

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

2013-01-10 09:05:18 -08: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: PPC: Emulate dcbf

2013-01-18 00:40:49 +01:00

lib

powerpc: Fix VMX fix for memcpy case

2012-10-04 18:02:43 +10:00

math-emu

…

mm

POWERPC: drivers: remove __dev* attributes.

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

net

PPC: net: bpf_jit_comp: add VLAN instructions for BPF JIT

2012-11-17 22:12:47 -05:00

oprofile

powerpc/oprofile: Fix error in oprofile power7_marked_instr_event() function

2013-01-29 10:18:14 +11:00

perf

powerpc/perf: Add missing L2 constraint handling in Power7 PMU

2012-11-15 13:00:36 +11:00

platforms

powerpc/pasemi: Fix crash on reboot

2013-01-29 10:18:14 +11:00

sysdev

POWERPC: drivers: remove __dev* attributes.

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

xmon

powerpc/xmon: Fallback to printk() in xmon_printf() if udbg is not setup

2012-11-15 13:00:02 +11:00

Kconfig

Bury the conditionals from kernel_thread/kernel_execve series

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

Kconfig.debug

powerpc: IOMMU fault injection

2012-07-10 19:18:59 +10:00

Makefile

powerpc: dtc is required to build dtb files

2012-11-15 12:59:21 +11:00

relocs_check.pl

…