commit | b69d3987f4360a5e7e9e55465b3cdd0cc204b79e | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 24 14:41:20 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 24 14:41:20 2008 -0700 |
tree | 8b2142b2ed4a4951b4d7fc13739b6207730e6b04 | |
parent | 57675e6e75c18f279b944dc2397cc9fd0053845e [diff] | |
parent | a4928cffe6435caf427ae673131a633c1329dbf3 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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