From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 May 2009 19:07:21 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.30-rc5~36
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5e30302b9ee75a01d65d8dcf4085254a5da1066d;p=~shefty%2Frdma-dev.git

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/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
---

5e30302b9ee75a01d65d8dcf4085254a5da1066d