git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 605f302 b921e90)

author	Michael Ellerman <mpe@ellerman.id.au>
	Thu, 26 Mar 2015 09:03:16 +0000 (20:03 +1100)
committer	Michael Ellerman <mpe@ellerman.id.au>
	Thu, 26 Mar 2015 09:04:28 +0000 (20:04 +1100)
commit	df60f57684529a1dde4461cf84354453b440806a
tree	618f030f673980a4c9d6bf27c1db50459a3b99d1	tree \| snapshot
parent	605f30205348f1d808d98d77505149da8b047b9f	commit \| diff
parent	b921e90260cec1e04988bb3763491de885b67b51	commit \| diff

Merge branch 'next-misc' of git://git./linux/kernel/git/benh/powerpc into test

Merge miscellaneous bits from benh. Fix a minor conflict with
OpalMessageType changing names to opal_msg_type.

arch/powerpc/include/asm/opal.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powernv/opal.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree