| author | John Stultz <john.stultz@linaro.org> | |
| Fri, 3 Dec 2010 00:47:52 +0000 (16:47 -0800) | ||
| committer | John Stultz <john.stultz@linaro.org> | |
| Fri, 3 Dec 2010 00:47:52 +0000 (16:47 -0800) | ||
| commit | b0f969009f647cd473c5e559aeec9c4229d12f87 | |
| tree | 34778ededa7623d811be4ac143a098a5dc11eed5 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 | commit | diff |
| parent | d3b8f889a220aed825accc28eb64ce283a0d51ac | commit | diff |
Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc
Conflicts:
Documentation/kernel-parameters.txt
Conflicts:
Documentation/kernel-parameters.txt
| Documentation/kernel-parameters.txt | diff1 | | diff2 | | blob | history |
| arch/x86/kernel/tsc.c | diff1 | | diff2 | | blob | history |