diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 02:31:42 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 02:31:42 +0100 |
commit | 147db6e9474b444149238b77ceae335ca20e7b4a (patch) | |
tree | fefae0ecba79917efbbf22054474271af8f291ae /drivers/watchdog/wdt285.c | |
parent | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | ftrace: handle archs that do not support irqs_disabled_flags (diff) | |
download | linux-147db6e9474b444149238b77ceae335ca20e7b4a.tar.xz linux-147db6e9474b444149238b77ceae335ca20e7b4a.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:
ftrace: handle archs that do not support irqs_disabled_flags
Diffstat (limited to 'drivers/watchdog/wdt285.c')
0 files changed, 0 insertions, 0 deletions