diff options
| author | John Stultz <john.stultz@linaro.org> | 2010-12-02 16:47:52 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2010-12-02 16:47:52 -0800 |
| commit | b0f969009f647cd473c5e559aeec9c4229d12f87 (patch) | |
| tree | 34778ededa7623d811be4ac143a098a5dc11eed5 /samples | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
| parent | d3b8f889a220aed825accc28eb64ce283a0d51ac (diff) | |
| download | linux-b0f969009f647cd473c5e559aeec9c4229d12f87.tar.gz linux-b0f969009f647cd473c5e559aeec9c4229d12f87.tar.bz2 linux-b0f969009f647cd473c5e559aeec9c4229d12f87.zip | |
Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc
Conflicts:
Documentation/kernel-parameters.txt
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions