kernel_optimize_test/arch/m32r
Linus Torvalds 4aed2fd8e3 Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)
  tracing/kprobes: unregister_trace_probe needs to be called under mutex
  perf: expose event__process function
  perf events: Fix mmap offset determination
  perf, powerpc: fsl_emb: Restore setting perf_sample_data.period
  perf, powerpc: Convert the FSL driver to use local64_t
  perf tools: Don't keep unreferenced maps when unmaps are detected
  perf session: Invalidate last_match when removing threads from rb_tree
  perf session: Free the ref_reloc_sym memory at the right place
  x86,mmiotrace: Add support for tracing STOS instruction
  perf, sched migration: Librarize task states and event headers helpers
  perf, sched migration: Librarize the GUI class
  perf, sched migration: Make the GUI class client agnostic
  perf, sched migration: Make it vertically scrollable
  perf, sched migration: Parameterize cpu height and spacing
  perf, sched migration: Fix key bindings
  perf, sched migration: Ignore unhandled task states
  perf, sched migration: Handle ignored migrate out events
  perf: New migration tool overview
  tracing: Drop cpparg() macro
  perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call
  ...

Fix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c
2010-08-06 09:30:52 -07:00
..
boot m32r: fix arch/m32r/boot/compressed/Makefile 2009-11-09 09:00:50 +09:00
configs eeprom: More consistent symbol names 2009-01-26 21:19:57 +01:00
include/asm arch: Implement local64_t 2010-06-09 11:12:36 +02:00
kernel Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-05-19 17:10:06 -07:00
lib m32r: export delay loop symbols 2009-10-04 12:02:36 +09:00
mm m32r: invoke oom-killer from page fault 2010-06-04 15:21:44 -07:00
oprofile
platforms m32r: remove obsolete hw_interrupt_type 2009-06-16 19:47:46 -07:00
Kconfig m32r: bzip2/lzma kernel compression support 2009-11-04 08:37:33 +09:00
Kconfig.debug
Makefile kbuild: allow assignment to {A,C}FLAGS_KERNEL on the command line 2010-08-03 14:09:45 +02:00