Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux...

[pandora-kernel.git] / arch / mips / kernel / cevt-r4k.c

diff --cc arch/mips/kernel/cevt-r4k.c
Simple merge