aha/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 kmemtrace: Fix typos in documentation. 2008-12-29 15:34:09 +02:00
debugfs-pktcdvd [PATCH] pktcdvd: cleanup 2007-02-11 10:51:28 -08:00
ima_policy integrity: IMA policy 2009-02-06 09:05:31 +11:00
procfs-diskstats Enhanced partition statistics: documentation update 2008-02-08 12:42:11 +01:00
sysfs-block block: Data integrity infrastructure documentation 2008-07-03 13:21:13 +02:00
sysfs-bus-css [S390] cio: Introduce modalias for css bus. 2008-07-14 10:02:05 +02:00
sysfs-bus-pci PCI: Introduce /sys/bus/pci/devices/.../rescan 2009-03-20 14:59:07 -07:00
sysfs-bus-umc uwb: document UWB and WUSB sysfs files 2008-09-17 16:54:35 +01:00
sysfs-bus-usb Merge branch 'master' into for-upstream 2008-10-20 16:07:19 +01:00
sysfs-bus-usb-devices-usbsevseg USB: Added driver for a Delcom USB 7-segment LED Display 2008-10-17 14:40:51 -07:00
sysfs-c2port Add c2 port support 2008-11-12 17:17:18 -08:00
sysfs-class [PATCH] Add kernel<->userspace ABI stability documentation 2006-06-21 12:40:47 -07:00
sysfs-class-bdi fuse: fix bdi naming conflict 2008-05-24 09:56:07 -07:00
sysfs-class-pktcdvd [PATCH] pktcdvd: cleanup 2007-02-11 10:51:28 -08:00
sysfs-class-regulator regulator: add get_status() 2009-03-31 09:56:20 +01:00
sysfs-class-usb_host uwb: document UWB and WUSB sysfs files 2008-09-17 16:54:35 +01:00
sysfs-class-uwb_rc uwb: add basic radio manager 2008-11-19 14:46:33 +00:00
sysfs-dev sysfs: add /sys/dev/{char,block} to lookup sysfs path by major:minor 2008-07-21 21:54:40 -07:00
sysfs-devices [PATCH] Add kernel<->userspace ABI stability documentation 2006-06-21 12:40:47 -07:00
sysfs-devices-memory mm: show node to memory section relationship with symlinks in sysfs 2009-01-06 15:59:00 -08:00
sysfs-firmware-acpi ACPI: bugfix reporting of event handler status 2008-10-28 01:53:19 -04:00
sysfs-firmware-memmap Bernhard has moved 2009-02-18 15:37:56 -08:00
sysfs-firmware-sgi_uv sysfs: document files in /sys/firmware/sgi_uv/ 2008-09-02 19:21:40 -07:00
sysfs-fs-ext4 ext4: Add sysfs support 2009-03-31 09:10:09 -04:00
sysfs-gpio Documentation/ABI: /sys/class/gpio 2008-09-13 14:41:52 -07:00
sysfs-ibft Firmware: add iSCSI iBFT Support 2008-04-19 19:10:28 -07:00
sysfs-kernel-mm mm: create /sys/kernel/mm 2008-07-24 10:47:17 -07:00
sysfs-kernel-mm-hugepages hugetlb: new sysfs interface 2008-07-24 10:47:17 -07:00
sysfs-kernel-uids Documentation: create new scheduler/ subdirectory 2008-02-07 08:42:17 -08:00
sysfs-ocfs2 ocfs2: Document /sys/fs/ocfs2 2008-04-18 08:56:07 -07:00
sysfs-power [PATCH] swsusp: debugging 2006-11-03 12:27:58 -08:00
sysfs-profiling profiling: dynamically enable readprofile at runtime 2008-10-16 11:21:31 -07:00
sysfs-wusb_cbaf uwb: document UWB and WUSB sysfs files 2008-09-17 16:54:35 +01:00