diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 17:47:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 17:47:27 -0800 |
| commit | 6e03db2ba17b5d32431b4c2012e6a41153318a90 (patch) | |
| tree | 001d90ae19ec62d7f34df127a36783ef78e5bc75 /arch/x86/um/Makefile | |
| 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
Diffstat (limited to 'arch/x86/um/Makefile')
0 files changed, 0 insertions, 0 deletions