| commit | a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 02 09:45:44 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 02 09:45:44 2009 -0800 |
| tree | 89dce7d51c11ea56150e4f5613a28369e238f90e | |
| parent | efcd9e0b91bcb92a1dd530d1a1f26eb83a5d21e2 [diff] | |
| parent | 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 [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: tracing: Remove cpu arg from the rb_time_stamp() function tracing: Fix comment typo and documentation example tracing: Fix trace_seq_printf() return value tracing: Update *ppos instead of filp->f_pos