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

author	Simon Horman <horms+renesas@verge.net.au>
	Thu, 27 Jun 2013 08:22:27 +0000 (17:22 +0900)
committer	Simon Horman <horms+renesas@verge.net.au>
	Thu, 27 Jun 2013 08:22:27 +0000 (17:22 +0900)
commit	77f95d1268b6a051fe97289447aa48f964a300dc
tree	dfbc8f0725019c502f6b0e9a9aaf5d916a951dd1	tree \| snapshot
parent	d53891e2491c0681b86267efc0f07dd994e15337	commit \| diff
parent	d69626d8913ceeacaa2cd369a2487c85f818fef1	commit \| diff
parent	2c83322ce820bcf2d5e8265de831489076ee211e	commit \| diff
parent	c4fa4946f177ae214523586cd794ac18d34b1430	commit \| diff
parent	0d7c1210992ff05ee8de5d2c790defded3856f29	commit \| diff
parent	cd622017eb3e0ab841502df88fb7fda3c3a58eb9	commit \| diff
parent	5f10428e4a6d99cc019270c51ad5a33fb38addeb	commit \| diff
parent	d4759ded3bdf3eb004d583011707fdc21aeda94e	commit \| diff
parent	e305062e94719ef543ae936dd56501b5a36406c6	commit \| diff
parent	e0f70f60c658058d52a0b55913a13302e12cf897	commit \| diff
parent	53332005bfde9d2e3c9a66030c0e8c2598eaa1d5	commit \| diff
parent	c14ccd935e2479c4253ae6a46f0a287e4f8816c7	commit \| diff

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

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