]> 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>
Mon, 7 Nov 2011 00:03:54 +0000 (11:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 00:03:54 +0000 (11:03 +1100)
commit2ba46ebc8dfe993f257a9bc53bc153b02d6d204e
tree10165c4c9691f8e64b9d04ea5a9467272a8b073d
parentf48c60493504d65ac174f2a8b4ceb4204dd392ae
parente612ca4c7c2c1246bd0960d699417b32090e335e
Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
arch/mips/alchemy/common/dbdma.c
arch/mips/kernel/perf_event.c
arch/mips/alchemy/common/dbdma.c
arch/mips/alchemy/devboards/db1200/platform.c
arch/mips/include/asm/mach-bcm47xx/gpio.h
arch/mips/sgi-ip27/ip27-irq.c