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

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

Signed-off-by: Wolfgang Denk <wd@denx.de>

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