original_kernel/Documentation/ABI/testing
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
..
debugfs-kmemtrace
debugfs-pktcdvd
ima_policy
procfs-diskstats
sysfs-block
sysfs-bus-css
sysfs-bus-pci PCI: Introduce /sys/bus/pci/devices/.../rescan 2009-03-20 14:59:07 -07:00
sysfs-bus-umc
sysfs-bus-usb
sysfs-bus-usb-devices-usbsevseg
sysfs-c2port
sysfs-class
sysfs-class-bdi
sysfs-class-pktcdvd
sysfs-class-regulator regulator: add get_status() 2009-03-31 09:56:20 +01:00
sysfs-class-usb_host
sysfs-class-uwb_rc
sysfs-dev
sysfs-devices
sysfs-devices-memory
sysfs-firmware-acpi
sysfs-firmware-memmap Bernhard has moved 2009-02-18 15:37:56 -08:00
sysfs-firmware-sgi_uv
sysfs-fs-ext4 ext4: Add sysfs support 2009-03-31 09:10:09 -04:00
sysfs-gpio
sysfs-ibft
sysfs-kernel-mm
sysfs-kernel-mm-hugepages
sysfs-kernel-uids
sysfs-ocfs2
sysfs-power
sysfs-profiling
sysfs-wusb_cbaf