Merge branch 'alchemy-for-3.3' into mips-for-linux-next

diff --cc arch/mips/alchemy/common/dbdma.c
Simple merge

diff --cc arch/mips/alchemy/common/time.c
Simple merge

diff --cc arch/mips/alchemy/devboards/db1200.c
Simple merge

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