git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Simon Horman <horms+renesas@verge.net.au>
	Tue, 18 Jun 2013 07:47:43 +0000 (16:47 +0900)
committer	Simon Horman <horms+renesas@verge.net.au>
	Tue, 18 Jun 2013 07:47:43 +0000 (16:47 +0900)
commit	c8c53bcb63adfed61883b4cebafb32a6c8eb5fc2
tree	bf8a425db60b9e30c3ae84690059202189c898d4	tree \| snapshot
parent	d69626d8913ceeacaa2cd369a2487c85f818fef1	commit \| diff
parent	2c83322ce820bcf2d5e8265de831489076ee211e	commit \| diff
parent	561a1a31d232d0f2b1ce7b7480bd03aba97e818d	commit \| diff
parent	0d7c1210992ff05ee8de5d2c790defded3856f29	commit \| diff
parent	cd622017eb3e0ab841502df88fb7fda3c3a58eb9	commit \| diff
parent	5f10428e4a6d99cc019270c51ad5a33fb38addeb	commit \| diff
parent	c972f024c1097fa0798beafc21be1eeeba21ac34	commit \| diff
parent	159f8a0209aff155af7f6fcdedd4a4484dd19c23	commit \| diff
parent	53332005bfde9d2e3c9a66030c0e8c2598eaa1d5	commit \| diff
parent	f9094c526bca3cc50ef7d409c22976fa0f47bbba	commit \| diff

Merge branches 'heads/defconfig', 'heads/boards', 'heads/dt', 'heads/intc-external-irq', 'heads/pinmux', 'heads/boards-marzen-fixes', 'heads/sh-sci', 'heads/gpio-rcar', 'heads/cleanup-boot' and 'heads/cleanup' into next

Conflicts:
arch/arm/mach-shmobile/setup-r8a7790.c

arch/arm/mach-shmobile/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/mach-shmobile/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/mach-shmobile/board-marzen.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/mach-shmobile/include/mach/r8a7740.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7740.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7790.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history