git.sur5r.net Git - u-boot/commit

]> git.sur5r.net Git - u-boot/commit

projects / u-boot / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 60985bb a71d45d)

author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Thu, 30 May 2013 12:45:06 +0000 (14:45 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Thu, 30 May 2013 12:45:06 +0000 (14:45 +0200)
commit	a19b0dd62d7b8efc658fa1aa685ff5665878f3ee
tree	1fadf0fb3da83203ba28f209ec99e1b33e03f4d5	tree \| snapshot
parent	60985bba58e7695dac1fddae8cdbb62d8cfd1254	commit \| diff
parent	a71d45d706a5b51c348160163b6c159632273fed	commit \| diff

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
common/cmd_fpga.c
drivers/usb/host/ohci-at91.c

.gitignore	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg	diff1 \|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
common/Makefile	diff1 \|	diff2 \|	blob \| history
common/cmd_fpga.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-at91.c	diff1 \|	diff2 \|	blob \| history
include/netdev.h	diff1 \|	diff2 \|	blob \| history
include/phy.h	diff1 \|	diff2 \|	blob \| history

Cloned from git://git.denx.de/u-boot.git