Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Apr 2008 21:41:20 +0000 (14:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Apr 2008 21:41:20 +0000 (14:41 -0700)
commitb69d3987f4360a5e7e9e55465b3cdd0cc204b79e
tree8b2142b2ed4a4951b4d7fc13739b6207730e6b04
parent57675e6e75c18f279b944dc2397cc9fd0053845e
parenta4928cffe6435caf427ae673131a633c1329dbf3
Merge branch 'for-linus' of git://git./linux/kernel/git/x86/linux-2.6-x86-fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
  "make namespacecheck" fixes
  x86: fix compilation error in VisWS
  x86: voyager fix
  x86: Drop duplicate from setup.c
  intel-iommu.c: dma ops fix