]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jun 2009 23:15:59 +0000 (16:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jun 2009 23:15:59 +0000 (16:15 -0700)
commit595dc54a1da91408a52c4b962f3deeb1109aaca0
tree918dd8ad8bfb44410b16fea7901c3a81111fa831
parent9b29e8228a5c2a169436a1a90a60b1f88cb35cd1
parent7d96fd41cadc55f4e00231c8c71b8e25c779f122
Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: move rdtsc_barrier() into the TSC vread method
arch/x86/kernel/tsc.c