linux-sg2042/arch/xtensa
Linus Torvalds 714f83d5d9 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
  tracing, net: fix net tree and tracing tree merge interaction
  tracing, powerpc: fix powerpc tree and tracing tree interaction
  ring-buffer: do not remove reader page from list on ring buffer free
  function-graph: allow unregistering twice
  trace: make argument 'mem' of trace_seq_putmem() const
  tracing: add missing 'extern' keywords to trace_output.h
  tracing: provide trace_seq_reserve()
  blktrace: print out BLK_TN_MESSAGE properly
  blktrace: extract duplidate code
  blktrace: fix memory leak when freeing struct blk_io_trace
  blktrace: fix blk_probes_ref chaos
  blktrace: make classic output more classic
  blktrace: fix off-by-one bug
  blktrace: fix the original blktrace
  blktrace: fix a race when creating blk_tree_root in debugfs
  blktrace: fix timestamp in binary output
  tracing, Text Edit Lock: cleanup
  tracing: filter fix for TRACE_EVENT_FORMAT events
  ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
  x86: kretprobe-booster interrupt emulation code fix
  ...

Fix up trivial conflicts in
 arch/parisc/include/asm/ftrace.h
 include/linux/memory.h
 kernel/extable.c
 kernel/module.c
2009-04-05 11:04:19 -07:00
..
boot xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
configs xtensa: platform: s6105 2009-04-02 23:44:31 -07:00
include/asm Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
kernel Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge 2009-04-03 02:29:05 -07:00
lib xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
mm xtensa: nommu support 2009-04-02 23:41:50 -07:00
platforms xtensa: we don't need to include asm/io.h 2009-04-03 00:16:34 -07:00
variants xtensa: only build platform or variant if they contain a Makefile 2009-04-03 00:06:45 -07:00
Kconfig xtensa: ccount clocksource 2009-04-02 23:45:22 -07:00
Kconfig.debug [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 1 2005-06-24 00:05:21 -07:00
Makefile xtensa: only build platform or variant if they contain a Makefile 2009-04-03 00:06:45 -07:00