| commit | a48ecc969f8d2d0fe9167962e9b8b4cca52de10b | [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 | bec9cab9291bb221714d559a44fe37669a8ca604 [diff] | |
| parent | ceb70b466e75ceb1a621b6163f7e31116bfc8094 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: drivers/spi/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>