Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Fri, 13 Sep 2013 10:04:54 +0000 (12:04 +0200)
committerStefano Babic <sbabic@denx.de>
Fri, 13 Sep 2013 10:10:07 +0000 (12:10 +0200)
commitc4a7ece02046f647019cc0aaddf530833a8db29c
tree06342cd9b8cc41b95442a992fb38a1bc8671b05c
parentb5e7f1bc4b899ea34e838d5d60b3e6f8e479d0a9
parent8386ca8bea7a6a8469c3b6a99313afb642e6cbeb
Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
MAINTAINERS
boards.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>
boards.cfg