diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-19 11:35:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-19 11:35:52 -0500 |
| commit | 83ff1af9d330348d1a6685b0c06d33847cd72723 (patch) | |
| tree | 41c87626e29fa8ee35cc27c324b9ec637e6efafb /kernel/trace/ftrace.c | |
| parent | a1342d3b8e5dbffae9d5520e2847d7d605c25266 (diff) | |
| parent | 23d75d9cadd79bc9fd6553857d57c679cf18d4cb (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] fix "mem=" handling in case of standby memory
[S390] Fix timeval regression on s390
[S390] sclp: handle empty event buffers
Diffstat (limited to 'kernel/trace/ftrace.c')
0 files changed, 0 insertions, 0 deletions