git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5ec79bf 3220145)

author	Ralf Baechle <ralf@linux-mips.org>
	Wed, 28 May 2014 17:00:14 +0000 (19:00 +0200)
committer	Ralf Baechle <ralf@linux-mips.org>
	Thu, 29 May 2014 13:08:23 +0000 (15:08 +0200)
commit	2e2d663d2dd64ffe9855be0b35aa221c9b8139f2
tree	508667aa6fbab564e7875d3953671265d0176e69	tree \| snapshot
parent	5ec79bf919ddb53fd98893b7217897c839aa19cc	commit \| diff
parent	322014531e1fac4674b8eef67e4f80aca1e9f003	commit \| diff

Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux-next

14 files changed:

arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/mmu_context.h	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/pm.h	\|	diff2 \|	blob \| history
arch/mips/include/uapi/asm/inst.h	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/cevt-r4k.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/idle.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/smp-cps.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/mips/mm/c-r4k.c	diff1 \|	diff2 \|	blob \| history
arch/mips/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/mips/mm/tlb-r4k.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git