[commits] [git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

The following commit has been merged in the linux branch: commit a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a Merge: efcd9e0b91bcb92a1dd530d1a1f26eb83a5d21e2 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 Author: Linus Torvalds torvalds@linux-foundation.org Date: Mon Nov 2 09:45:44 2009 -0800

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