diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 13:25:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 13:25:47 -0700 |
| commit | a048d3aff8b828b6c0fa7ddd90a531248ab4e0f9 (patch) | |
| tree | 8edfb5bd152aef0d48c4a165247906db347c3a56 /drivers/net/gianfar_mii.c | |
| parent | fb3b80614438f8b73b3879a19350439d6aa402da (diff) | |
| parent | 1fe371044b21b226b96a9dd959e971b50b28c78e (diff) | |
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: fix modular build
ftrace: disable tracing on acpi idle calls
ftrace: remove latency-tracer leftover
ftrace: only trace preempt off with preempt tracer
ftrace: fix 4d3702b6 (post-v2.6.26): WARNING: at kernel/lockdep.c:2731 check_flags (ftrace)
Diffstat (limited to 'drivers/net/gianfar_mii.c')
0 files changed, 0 insertions, 0 deletions