From: John Stultz <john.stultz@linaro.org>
Date: Fri, 3 Dec 2010 00:47:52 +0000 (-0800)
Subject: Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc
X-Git-Tag: v2.6.38-rc1~480^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0f969009f647cd473c5e559aeec9c4229d12f87;p=pandora-kernel.git

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

Conflicts:
	Documentation/kernel-parameters.txt
---

b0f969009f647cd473c5e559aeec9c4229d12f87
Reading git-diff-tree failed