Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / arch / mips / kernel / cpu-probe.c

diff --cc arch/mips/kernel/cpu-probe.c
Simple merge