| commit | 6e03db2ba17b5d32431b4c2012e6a41153318a90 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 16 17:47:27 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 16 17:47:27 2012 -0800 |
| tree | 001d90ae19ec62d7f34df127a36783ef78e5bc75 | |
| parent | e032d80774315869aa2285b217fdbbfed86c0b49 [diff] | |
| parent | 1a51a0ce174ddc0b0c11b6a0dbd179d95020e80b [diff] |
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