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)
commitae82bfd61ca7e57cc2d914add9ab0873e260f2f5
treea7f862ad8b0ae4f2e8953e6aa613eb702b484ecf
parentcd74c86bdf705f824d494a2bbda393d1d562b40a
parentebc79c4f8da0f92efa968e0328f32334a2ce80cf
Merge branch 'linus' into perfcounters/rename

Merge reason: pull in all the latest code before doing the rename.

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