Merge branch 'pull_request_82'
authorPiotr Dymacz <pepe2k@gmail.com>
Thu, 5 Nov 2015 20:29:42 +0000 (21:29 +0100)
committerPiotr Dymacz <pepe2k@gmail.com>
Thu, 5 Nov 2015 20:29:42 +0000 (21:29 +0100)
1  2 
Makefile
u-boot/common/cmd_bootm.c
u-boot/cpu/mips/ar7240/ag7240.c
u-boot/include/common.h
u-boot/include/configs/ap121.h

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge