diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 02:47:27 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 02:47:27 +0100 |
commit | 6e03db2ba17b5d32431b4c2012e6a41153318a90 (patch) | |
tree | 001d90ae19ec62d7f34df127a36783ef78e5bc75 /tools | |
parent | mce: fix warning messages about static struct mce_device (diff) | |
parent | ARM: OMAP3: fix build on !CONFIG_IOMMU_API (diff) | |
download | linux-6e03db2ba17b5d32431b4c2012e6a41153318a90.tar.xz linux-6e03db2ba17b5d32431b4c2012e6a41153318a90.zip |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
ARM: OMAP3: fix build on !CONFIG_IOMMU_API
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions