Merge branch 'master' of git://git.denx.de/u-boot-arm
authorStefano Babic <sbabic@denx.de>
Wed, 5 Mar 2014 11:51:26 +0000 (12:51 +0100)
committerStefano Babic <sbabic@denx.de>
Wed, 5 Mar 2014 11:51:26 +0000 (12:51 +0100)
1  2 
include/mmc.h

diff --cc include/mmc.h
Simple merge