Merge branch 'master' of git://git.denx.de/u-boot-avr32
authorWolfgang Denk <wd@denx.de>
Sat, 17 Mar 2012 20:50:59 +0000 (21:50 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 17 Mar 2012 20:50:59 +0000 (21:50 +0100)
commit6e94125f9ccde8e7f8f94902b8d253bda5bb68c8
tree689b740e1d175a5d2dfbce89d2ebb0e9350a1da3
parent6ae38b8c583c61f00c2fe9904cafa81932c7faaf
parenta7a564c55c3b53e5af091b82070ca1f67cba70f7
Merge branch 'master' of git://git.denx.de/u-boot-avr32

* 'master' of git://git.denx.de/u-boot-avr32:
  atmel_mci.h: remove outdated register macros
  doc/git-mailrc: add <me> to avr32 alias
  ATMEL: remove old atmel_mci driver
  ATMEL: use generic mmc framework