Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Tue, 20 Jan 2015 15:21:36 +0000 (10:21 -0500)
committerTom Rini <trini@ti.com>
Tue, 20 Jan 2015 15:21:36 +0000 (10:21 -0500)
commit1cd20006989532c0a688870a43727ace58997785
treefc4ac0ad47bbce444fcea5c16b7df97595970270
parentb44a414959e3a32576a243aaa4966c1a9565ccfa
parentfc5b32fbf3bd43dabaf409e424e0bfb9a1b4df26
Merge branch 'master' of git://git.denx.de/u-boot-mmc