OSDN Git Service

Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux...
authorRalf Baechle <ralf@linux-mips.org>
Wed, 28 May 2014 17:00:14 +0000 (19:00 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 29 May 2014 13:08:23 +0000 (15:08 +0200)
commit2e2d663d2dd64ffe9855be0b35aa221c9b8139f2
tree508667aa6fbab564e7875d3953671265d0176e69
parent5ec79bf919ddb53fd98893b7217897c839aa19cc
parent322014531e1fac4674b8eef67e4f80aca1e9f003
Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux-next
14 files changed:
arch/mips/Kconfig
arch/mips/include/asm/mmu_context.h
arch/mips/include/asm/pm.h
arch/mips/include/uapi/asm/inst.h
arch/mips/kernel/Makefile
arch/mips/kernel/asm-offsets.c
arch/mips/kernel/cevt-r4k.c
arch/mips/kernel/idle.c
arch/mips/kernel/smp-cps.c
arch/mips/kernel/smp.c
arch/mips/kernel/traps.c
arch/mips/mm/c-r4k.c
arch/mips/mm/init.c
arch/mips/mm/tlb-r4k.c