]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ae38b8 a7a564c)
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)
* '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


Trivial merge
Cloned from git://git.denx.de/u-boot.git