From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Jan 2009 03:03:11 +0000 (-0800)
Subject: Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.29-rc1~495
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0578c3b4d44c34e499e1fd5916ed6c63635b25cf;p=linux-2.6-omap-h63xx.git

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

0578c3b4d44c34e499e1fd5916ed6c63635b25cf