Fix merge problems
[platform/kernel/u-boot.git] / drivers / mmc / atmel_mci.c
2008-08-06 Stefan RoeseFix merge problems
2008-07-10 Jon LoeligerMerge commit 'wd/master'
2008-07-10 Stefan RoeseMerge branch 'master' of /home/stefan/git/u-boot/u...
2008-07-09 Wolfgang DenkMerge branch 'master' of git://denx.de/git/u-boot-nand...
2008-07-09 Haavard Skinnemoenmmc: Move atmel_mci driver into drivers/mmc