Merge branch 'oc_recovery' to master
authorPiotr Dymacz <pepe2k@gmail.com>
Wed, 4 Dec 2013 22:22:09 +0000 (23:22 +0100)
committerPiotr Dymacz <pepe2k@gmail.com>
Wed, 4 Dec 2013 22:22:09 +0000 (23:22 +0100)
commitf07d176785a9d05f0a0772d231203d9be4e1d75b
tree6410e850b5537228ec21e3f8449031834792f0dc
parenteb8de059654d2bcc96bcb2512713e9d76d4c0cc5
parent406d377f9bc1a044c4631732bf595efab623003b
Merge branch 'oc_recovery' to master
u-boot/Makefile
u-boot/board/ar7240/ap121/ap121.c
u-boot/board/ar7240/common/ar7240_flash.c
u-boot/board/ar7240/common/ar7240_s26_phy.c
u-boot/cpu/mips/ar7240/ag7240.c
u-boot/cpu/mips/ar7240/ag934x.c
u-boot/include/configs/ap121.h
u-boot/lib_mips/board.c
u-boot/net/bootp.c