]> git.karo-electronics.de Git - karo-tx-uboot.git/commit - board/gth/pcmcia.c
Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Sat, 17 Jul 2010 18:49:59 +0000 (20:49 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 17 Jul 2010 19:36:00 +0000 (21:36 +0200)
commit293e3938d06571e92f6562bdae54223ff4b130c8
tree2c9e46332357b4b1bbb2c16b397d22958fcacfc3
parent0fe247b973d9b8f7e2c04cc159fcdd2e64591e55
parent7c050f818b51841de77fbfd077080d94f3c8b3ad
Merge branch 'master' of git://git.denx.de/u-boot-video