Skip to content
Commit b0f96900 authored by John Stultz's avatar John Stultz
Browse files

Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc 

Conflicts:
	Documentation/kernel-parameters.txt
parents 3561d43f d3b8f889
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment