Merge commit 'linux-pnfs/nfs41-for-2.6.31' into nfsv41-for-2.6.31

[linux-2.6] / arch / x86 / kernel / cpu / mtrr / Makefile

obj-y           := main.o if.o generic.o state.o cleanup.o
obj-$(CONFIG_X86_32) += amd.o cyrix.o centaur.o