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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b2212ea 41797f7)

author	Paul Mundt <lethal@linux-sh.org>
	Thu, 10 May 2012 02:51:07 +0000 (11:51 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Thu, 10 May 2012 02:51:07 +0000 (11:51 +0900)
commit	15f99cbd071aa402e113d342448603344a337046
tree	56f98892d1bd38029988eb8931e2321ef7e79aa0	tree \| snapshot
parent	b2212ea41dacda8cce0e7681a3a6ccc76c63802e	commit \| diff
parent	41797f75486d8ca3b98d7658c2a506ac7879a8e5	commit \| diff

Merge branch 'sh/rsk-updates' into sh-latest

Conflicts:
arch/sh/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/sh/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/boards/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/sh/kernel/cpu/proc.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree