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

* 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (44 commits)
  vsnprintf: remove duplicate comment of vsnprintf
  softirq: add BLOCK_IOPOLL to softirq_to_name
  oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP
  tracing: switch function prints from %pf to %ps
  vsprintf: add %ps that is the same as %pS but is like %pf
  tracing: Fix minor bugs for __unregister_ftrace_function_probe
  tracing: remove notrace from __kprobes annotation
  tracing: optimize global_trace_clock cachelines
  MAINTAINERS: Update tracing tree details
  ftrace: document function and function graph implementation
  tracing: make testing syscall events a separate configuration
  tracing: remove some unused macros
  ftrace: add compile-time check on F_printk()
  tracing: fix F_printk() typos
  tracing: have TRACE_EVENT macro use __flags to not shadow parameter
  tracing: add static to generated TRACE_EVENT functions
  ring-buffer: typecast cmpxchg to fix PowerPC warning
  tracing: add filter event logic to special, mmiotrace and boot tracers
  tracing: remove trace_event_types.h
  tracing: use the new trace_entries.h to create format files
  ...

diff --combined MAINTAINERS
index 7d2e5c05ccdc2d9d2768852ecb60edaf4189199d,9addc2838e4f2e17112c67f5ef010a744790e6cc..e613c6dd709f714d0e8745416e95a79237d8c990
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -931,12 -931,6 +931,12 @@@ W:       http://wireless.kernel.org/en/users/
  S:    Maintained
  F:    drivers/net/wireless/ath/ar9170/
  
 +ATK0110 HWMON DRIVER
 +M:    Luca Tettamanti <kronos.it@gmail.com>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    drivers/hwmon/asus_atk0110.c
 +
  ATI_REMOTE2 DRIVER
  M:    Ville Syrjala <syrjala@sci.fi>
  S:    Maintained
@@@ -2158,13 -2152,16 +2158,16 @@@ F:   Documentation/filesystems/caching
  F:    fs/fscache/
  F:    include/linux/fscache*.h
  
- FTRACE
+ TRACING
  M:    Steven Rostedt <rostedt@goodmis.org>
+ M:    Frederic Weisbecker <fweisbec@gmail.com>
+ M:    Ingo Molnar <mingo@redhat.com>
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
  S:    Maintained
  F:    Documentation/trace/ftrace.txt
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
- F:    include/*/ftrace.h
+ F:    include/*/ftrace.h include/trace/ include/linux/trace*.h
  F:    kernel/trace/
  
  FUJITSU FR-V (FRV) PORT
@@@ -5707,7 -5704,7 +5710,7 @@@ F:      include/xen
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -M:    Felix Blyakher <felixb@sgi.com>
 +M:    Alex Elder <aelder@sgi.com>
  M:    xfs-masters@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs