]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mips/mips-for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:31:03 +0000 (13:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:31:03 +0000 (13:31 +1100)
commitcb25fe76fe0e0b9562130727576792f559212033
tree198267cd6e7957920d67a7e2c93aaa384fd1cc45
parentce1fe23670feb866d321766c53d9d9d8b0e12c99
parent3ba1e543ab4b02640d396098f2f6a199560d5f2d
Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
drivers/ide/Kconfig
drivers/mmc/host/au1xmmc.c
drivers/video/Kconfig
sound/mips/Kconfig
20 files changed:
arch/mips/Kconfig
arch/mips/alchemy/devboards/db1200/platform.c
arch/mips/alchemy/devboards/db1x00/platform.c
arch/mips/include/asm/mach-au1x00/au1xxx_psc.h
drivers/i2c/busses/Kconfig
drivers/i2c/busses/i2c-au1550.c
drivers/ide/Kconfig
drivers/mmc/host/Kconfig
drivers/mmc/host/au1xmmc.c
drivers/net/ethernet/amd/au1000_eth.c
drivers/net/ethernet/amd/au1000_eth.h
drivers/net/irda/Kconfig
drivers/usb/Kconfig
drivers/usb/host/Makefile
drivers/usb/host/ehci-au1xxx.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ohci-au1xxx.c
drivers/video/Kconfig
sound/mips/Kconfig
sound/soc/au1x/Kconfig