git.librecmc.org Git - oweals/u-boot.git/commit

projects / oweals / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 136179b 020198b)

author	Tom Rini <trini@konsulko.com>
	Fri, 25 Nov 2016 22:39:54 +0000 (17:39 -0500)
committer	Tom Rini <trini@konsulko.com>
	Fri, 25 Nov 2016 22:39:54 +0000 (17:39 -0500)
commit	ed77ccd014b4073c4d282028cfb22f8d1742fec1
tree	0d3cf0fd0e45bf10c7897a24f3560589f7740e20	tree \| snapshot
parent	136179bec19f4bc84227cba138214ea392a723ea	commit \| diff
parent	020198b0c7d251cf6bde76024ecf0ee711860534	commit \| diff

Merge git://git.denx.de/u-boot-fsl-qoriq

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/Kconfig

arch/arm/Kconfig

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