git.cascardo.info Git - cascardo/linux.git/commit

author	Paul Mundt <lethal@linux-sh.org>
	Wed, 5 Jan 2011 08:25:29 +0000 (17:25 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Wed, 5 Jan 2011 08:25:29 +0000 (17:25 +0900)
commit	025a10a76808cfd9e55dbf965d0f1453e4f8ae84
tree	32f4f73efad9559b4fb83628e4f65d2c6bc062e3	tree \| snapshot
parent	6bf45a1018ff3cda8b6ef2fa7e023a023bc01dc8	commit \| diff
parent	f7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b	commit \| diff
parent	c070c203cde0e019cd373d3247137be11961deb3	commit \| diff
parent	d0fb0c4b3fc9b31cc635e89b6a2f9aaa30bf75db	commit \| diff

Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest

Conflicts:
arch/arm/mach-shmobile/Kconfig

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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

arch/arm/mach-shmobile/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-shmobile/clock-sh73a0.c	diff1 \|	\|	diff3 \|	\|	blob \| history