diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 19:21:40 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-03 19:21:40 +0100 |
commit | 457d2ee225801441e96f2e35894ec404572ad862 (patch) | |
tree | c671e5a35103dc8a7d1ea4cdc0484bcc0e6f8e50 /drivers/acpi/battery.c | |
parent | Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/... (diff) | |
parent | tracing, ring-buffer: add paranoid checks for loops (diff) | |
download | linux-457d2ee225801441e96f2e35894ec404572ad862.tar.xz linux-457d2ee225801441e96f2e35894ec404572ad862.zip |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing, ring-buffer: add paranoid checks for loops
ftrace: use kretprobe trampoline name to test in output
tracing, alpha: undefined reference to `save_stack_trace'
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions