| commit | 147db6e9474b444149238b77ceae335ca20e7b4a | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 31 Oct 2008 01:31:42 +0000 (30 18:31 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 31 Oct 2008 01:31:42 +0000 (30 18:31 -0700) | ||
| tree | fefae0ecba79917efbbf22054474271af8f291ae | treesnapshot (tar.gz zip) |
| parent | 43908195e04ee27779a60c55b5bb47aebf1c46ae | commitdiff |
| parent | 9244489a7b69fe0746dc7cb3957f02e05bd1ceb0 | commitdiff |
Merge branch 'tracing-fixes-for-linus' of git://git./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
* '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