Merge branches 'topic/drivers/fpga-20141006', 'topic/drivers/mmc-20141006', 'topic...
authorMarek Vasut <marex@denx.de>
Mon, 6 Oct 2014 15:45:55 +0000 (17:45 +0200)
committerMarek Vasut <marex@denx.de>
Mon, 6 Oct 2014 15:45:55 +0000 (17:45 +0200)

Trivial merge