Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commit0578c3b4d44c34e499e1fd5916ed6c63635b25cf
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jan 2009 03:03:11 +0000 (5 19:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jan 2009 03:03:11 +0000 (5 19:03 -0800)
tree7bcf1e4bb08984b2f5671a48c052c26903855ba6
parent7d8a804c594b61a05c698126165b5dc417d94a0f
parent52942b6b16c6ebb25f4dd4df0208d840ba0cbc5c
Merge branch 'core-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c
  intel-iommu: fix build error with INTR_REMAP=y and DMAR=n
  swiotlb: add missing __init annotations