Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[pandora-kernel.git] / arch / mips / power / Makefile
1 obj-$(CONFIG_HIBERNATION) += cpu.o hibernate.o