tree 3b030a04295fc031db98746c4074c2df1ed6a19f
parent 1eda75c131ea42ec173323b6c34aeed78ae637c1
parent 016aa2ed1cc9cf704cf76d8df07751b6daa9750f
author Ingo Molnar <mingo@elte.hu> 1300441133 +0100
committer Ingo Molnar <mingo@elte.hu> 1300441140 +0100

Merge branch 'linus' into x86/urgent

Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.

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