Merge branch 'linus' into perfcounters/rename
authorIngo Molnar <mingo@elte.hu>
Mon, 21 Sep 2009 10:51:27 +0000 (12:51 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 21 Sep 2009 10:51:42 +0000 (12:51 +0200)
Merge reason: pull in all the latest code before doing the rename.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge