Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into...
Thomas Gleixner [Mon, 4 Feb 2013 10:03:03 +0000 (11:03 +0100)]
Trivial conflict in arch/x86/Kconfig

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

1  2 
MAINTAINERS
arch/powerpc/kernel/time.c
arch/x86/Kconfig
arch/x86/kernel/tsc.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/rtc/class.c
fs/pstore/ram.c
kernel/time/Kconfig
kernel/time/timekeeping.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -106,14 -104,15 +106,15 @@@ config X8
        select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
        select GENERIC_TIME_VSYSCALL if X86_64
        select KTIME_SCALAR if X86_32
++      select ALWAYS_USE_PERSISTENT_CLOCK
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
 -      select HAVE_RCU_USER_QS if X86_64
 +      select HAVE_CONTEXT_TRACKING if X86_64
        select HAVE_IRQ_TIME_ACCOUNTING
 -      select ALWAYS_USE_PERSISTENT_CLOCK
 -      select GENERIC_KERNEL_THREAD
 -      select GENERIC_KERNEL_EXECVE
        select MODULES_USE_ELF_REL if X86_32
        select MODULES_USE_ELF_RELA if X86_64
 +      select CLONE_BACKWARDS if X86_32
 +      select GENERIC_SIGALTSTACK
  
  config INSTRUCTION_DECODER
        def_bool y
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/pstore/ram.c
Simple merge
Simple merge
Simple merge