Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Documentation/mips/AU1xxx_IDE.README

MAINTAINERS

arch/mips/Kconfig

arch/mips/Makefile

arch/mips/arc/Makefile

arch/mips/arc/identify.c

arch/mips/au1000/common/Makefile

arch/mips/au1000/common/au1xxx_irqmap.c

arch/mips/au1000/common/cputable.c

arch/mips/au1000/common/dbdma.c

arch/mips/au1000/common/dma.c

arch/mips/au1000/common/gpio.c

arch/mips/au1000/common/irq.c

arch/mips/au1000/common/platform.c

arch/mips/au1000/common/power.c

arch/mips/au1000/common/prom.c

arch/mips/au1000/common/puts.c

arch/mips/au1000/common/setup.c

arch/mips/au1000/common/time.c

arch/mips/au1000/common/usbdev.c