Merge branch '/tip/perf/filter' of git://git.kernel.org/pub/scm/linux/kernel/git...
Frederic Weisbecker [Wed, 2 Mar 2011 15:09:55 +0000 (16:09 +0100)]

Trivial merge