Merge commit 'v2.6.34-rc7' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 13 May 2010 06:11:26 +0000 (08:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 13 May 2010 06:11:29 +0000 (08:11 +0200)
Merge reason: Update from -rc5 to -rc7.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
Documentation/kernel-parameters.txt

Simple merge