]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/net/wireless/b43/pcmcia.c
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)
commitb0f969009f647cd473c5e559aeec9c4229d12f87
tree34778ededa7623d811be4ac143a098a5dc11eed5
parent3561d43fd289f590fdae672e5eb831b8d5cf0bf6
parentd3b8f889a220aed825accc28eb64ce283a0d51ac
Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc

Conflicts:
Documentation/kernel-parameters.txt
Documentation/kernel-parameters.txt
arch/x86/kernel/tsc.c