summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tracing/blktrace: fix up checkpatch reported problems in ftrace plugin patchArnaldo Carvalho de Melo2009-01-263-19/+31
* blktrace: add ftrace pluginArnaldo Carvalho de Melo2009-01-263-5/+654
* ftrace: add ftrace_vprintkArnaldo Carvalho de Melo2009-01-262-0/+17
* Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into trac...Ingo Molnar2009-01-261-103/+195
|\
| * tracing/function-graph-tracer: various fixes and featuresFrederic Weisbecker2009-01-231-103/+195
* | trace, lockdep: manual preempt count adding for local_bh_disableSteven Rostedt2009-01-233-5/+18
* | trace: fix logic to start/stop countingSteven Rostedt2009-01-231-7/+6
* | trace: remove internal irqsoff disabling for trace outputSteven Rostedt2009-01-231-32/+2
|/
* Merge branch 'tracing/ftrace' into tracing/coreIngo Molnar2009-01-233-37/+61
|\
| * ring-buffer: reset timestamps when ring buffer is resetSteven Rostedt2009-01-221-0/+3
| * wakeup-tracer: show scheduling data in outputSteven Rostedt2009-01-221-3/+8
| * trace: separate out rt tasks from wakeup tracerSteven Rostedt2009-01-221-2/+32
| * ring-buffer: do not swap if recording is disabledSteven Rostedt2009-01-222-1/+16
| * trace: do not disable wake up tracer on output of traceSteven Rostedt2009-01-221-31/+2
|/
* Merge branch 'tracing/ftrace' into tracing/coreIngo Molnar2009-01-227-82/+280
|\
| * trace_workqueue: use percpu data for workqueue statLai Jiangshan2009-01-201-35/+29
| * x86, ds, bts: cleanup DS configurationMarkus Metzger2009-01-201-14/+17
| * x86, ftrace, hw-branch-tracer: documentationMarkus Metzger2009-01-201-0/+74
| * x86, ftrace, hw-branch-tracer: change trace formatMarkus Metzger2009-01-201-8/+5
| * x86, ftrace, hw-branch-tracer: reset trace buffer on closeMarkus Metzger2009-01-201-1/+7
| * x86, ftrace, hw-branch-tracer: dump trace on oopsMarkus Metzger2009-01-204-8/+41
| * x86, ftrace, hw-branch-tracer: support hotplug cpusMarkus Metzger2009-01-201-16/+107
|/
* ftrace: test for running of recordmcount.pl twice on an objectSteven Rostedt2009-01-181-3/+18
* Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/coreIngo Molnar2009-01-18902-7911/+35870
|\
| * Linux 2.6.29-rc2v2.6.29-rc2Linus Torvalds2009-01-161-1/+1
| * Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2009-01-1617-212/+858
| |\
| | * ACPI PCI hotplug: harden against panic regressionJames Bottomley2009-01-161-0/+2
| | * Merge branch 'misc' into releaseLen Brown2009-01-1612-10/+23
| | |\
| | | * ACPI: rename main.c to sleep.cLen Brown2009-01-162-1/+1
| | | * dell-laptop: move to drivers/platform/x86/ from drivers/misc/Len Brown2009-01-164-2/+14
| | | * eeepc-laptop: enable Bluetooth ACPI detailsJonathan McDowell2009-01-161-2/+2
| | | * ACPI: fix ACPI_FADT_S4_RTC_WAKE commentDavid Brownell2009-01-161-1/+1
| | | * kprobes: check CONFIG_FREEZER instead of CONFIG_PMMasami Hiramatsu2009-01-163-3/+3
| | | * PM: Fix freezer compilation if PM_SLEEP is unsetRafael J. Wysocki2009-01-161-1/+2
| | * | Merge branch 'thinkpad-acpi' into releaseLen Brown2009-01-163-155/+791
| | |\ \
| | | * | ACPI: thinkpad-acpi: bump up version to 0.22Henrique de Moraes Holschuh2009-01-152-4/+4
| | | * | ACPI: thinkpad-acpi: handle HKEY event 6030Henrique de Moraes Holschuh2009-01-151-0/+6
| | | * | ACPI: thinkpad-acpi: clean-up fan subdriver quirkHenrique de Moraes Holschuh2009-01-151-51/+58
| | | * | ACPI: thinkpad-acpi: start the event hunt seasonHenrique de Moraes Holschuh2009-01-151-0/+3
| | | * | ACPI: thinkpad-acpi: handle HKEY thermal and battery alarmsHenrique de Moraes Holschuh2009-01-151-4/+59
| | | * | ACPI: thinkpad-acpi: clean up hotkey_notify()Henrique de Moraes Holschuh2009-01-151-65/+109
| | | * | ACPI: thinkpad-acpi: use killable instead of interruptible mutexesHenrique de Moraes Holschuh2009-01-151-13/+13
| | | * | ACPI: thinkpad-acpi: add UWB radio supportHenrique de Moraes Holschuh2009-01-152-1/+223
| | | * | ACPI: thinkpad-acpi: preserve radio state across shutdownHenrique de Moraes Holschuh2009-01-151-4/+55
| | | * | ACPI: thinkpad-acpi: resume with radios disabledHenrique de Moraes Holschuh2009-01-151-10/+56
| | | * | ACPI: thinkpad-acpi: debug facility to emulate the rf switchesHenrique de Moraes Holschuh2009-01-152-0/+201
| | | * | ACPI: thinkpad-acpi: struct device - replace bus_id with dev_name(), dev_set_...Kay Sievers2009-01-151-4/+4
| | | * | ACPI: thinkpad-acpi: update documents for the new locationHenrique de Moraes Holschuh2009-01-151-1/+2
| | | |/
| | | |
| | | \
| | *-. \ Merge branches 'bugzilla-11884' and 'bugzilla-8544' into releaseLen Brown2009-01-162-47/+42
| | |\ \ \
| | | | * | thermal fixup for broken BIOS which has invalid trip points.Zhang Rui2009-01-161-4/+12
| | | | |/