]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:47:59 +0000 (12:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:47:59 +0000 (12:47 +1000)
1  2 
MAINTAINERS
Makefile
arch/Kconfig
arch/x86/Kconfig
include/linux/sched.h
kernel/fork.c
kernel/signal.c

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc arch/Kconfig
Simple merge
index 3a41c4424a0a95b8b118ed428c3864a863c673a1,1c9ac7d9e0273ed87ea2096422cd0f893f815083..57e7e864442c28284a1edc5cb7211f878a25ac52
@@@ -82,10 -83,9 +83,10 @@@ config X8
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
        select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
 +      select HAVE_ARCH_SECCOMP_FILTER
  
  config INSTRUCTION_DECODER
-       def_bool (KPROBES || PERF_EVENTS)
+       def_bool (KPROBES || PERF_EVENTS || UPROBES)
  
  config OUTPUT_FORMAT
        string
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/signal.c
Simple merge