Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc
authorJohn Stultz <john.stultz@linaro.org>
Fri, 3 Dec 2010 00:47:52 +0000 (16:47 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 3 Dec 2010 00:47:52 +0000 (16:47 -0800)
Conflicts:
Documentation/kernel-parameters.txt


Trivial merge