| commit | 86875e5d617778cd6bf94c0201f12f2f062794e0 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue Jul 07 22:22:05 2009 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Jul 07 22:22:05 2009 +0200 |
| tree | 604e04770713cb314cb6184e26eeb4319dec3d43 | |
| parent | 5be1217637f25923fda9f6b628637016124e2e78 [diff] | |
| parent | 871e48144fc1357ec0496cc4869f703688f393b4 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: drivers/spi/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>