review.tizen.org Git - platform/adaptation/renesas_rcar/renesas_kernel.git/commit

projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5768282 da5cabf)

author	Paul Mundt <lethal@linux-sh.org>
	Mon, 16 Aug 2010 04:32:24 +0000 (13:32 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Mon, 16 Aug 2010 04:32:24 +0000 (13:32 +0900)
commit	bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301
tree	071fa9f86dc04a16570be367d04cff3b00c694ad	tree \| snapshot
parent	57682827b9a5edb52e33af0be9082b51bffcd5c7	commit \| diff
parent	da5cabf80e2433131bf0ed8993abc0f7ea618c73	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile

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

arch/sh/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/include/asm/Kbuild	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-sh_mobile.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/sh-sci.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;