Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

[~andy/linux] / arch / openrisc / mm / Makefile

#
# Makefile for the linux openrisc-specific parts of the memory manager.
#

obj-y   := fault.o tlb.o init.o ioremap.o