Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2009 19:07:21 +0000 (12:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2009 19:07:21 +0000 (12:07 -0700)
commit5e30302b9ee75a01d65d8dcf4085254a5da1066d
treed9a0c9a41962640fbfb02415e2f3983adacaa33d
parent35984d73f0829dd359639b34869cf08ba091ca98
parent35d11680a9d82c93eb92f08f9702b72877427b4a
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: show number of core_siblings instead of thread_siblings in /proc/cpuinfo
  amd-iommu: fix iommu flag masks
  x86: initialize io_bitmap_base on 32bit
  x86: gettimeofday() vDSO: fix segfault when tv == NULL