tree a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf
parent cd74c86bdf705f824d494a2bbda393d1d562b40a
parent ebc79c4f8da0f92efa968e0328f32334a2ce80cf
author Ingo Molnar <mingo@elte.hu> 1253530287 +0200
committer Ingo Molnar <mingo@elte.hu> 1253530302 +0200

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>