projects / oweals / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 44ceec2 14e099e)
Merge branch 'master' of git://www.denx.de/git/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Sun, 2 Mar 2008 20:29:18 +0000 (21:29 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 2 Mar 2008 20:29:18 +0000 (21:29 +0100)
commit2f6e76d23ced547a7f752abd4a753e7787559775
treec877ec70a6bf29e61ae4a58b477ac2d0eeef360etree | snapshot
parent44ceec253ea941b301abf4b079d52324def69d92commit | diff
parent14e099e698d41e8179d05c2b2dbcf704a236f748commit | diff
Merge branch 'master' of git://denx.de/git/u-boot-arm

Conflicts:

include/asm-arm/arch-imx/imx-regs.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
Unnamed repository; edit this file 'description' to name the repository.