diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
commit | 97e6722b8d6b5880c4d5751127d5083b1b7df27d (patch) | |
tree | 060c52298d42530f975064f7addc4e637fe00289 /drivers/telephony | |
parent | ftrace: avoid modifying kprobe'd records (diff) | |
parent | Linux 2.6.26-rc8 (diff) | |
download | linux-97e6722b8d6b5880c4d5751127d5083b1b7df27d.tar.xz linux-97e6722b8d6b5880c4d5751127d5083b1b7df27d.zip |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'drivers/telephony')
0 files changed, 0 insertions, 0 deletions