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

Browse source

Conflicts:
	Documentation/kernel-parameters.txt

...

This commit is contained in:

John Stultz 2010-12-02 16:47:52 -08:00

parent 3561d43fd2 d3b8f889a2

commit b0f969009f

2 changed files with 10 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

Documentation/kernel-parameters.txt

View file

7

arch/x86/kernel/tsc.c

View file