]> git.karo-electronics.de Git - karo-tx-uboot.git/commit - board/gth/pcmcia.c
Merge branch 'master' of /home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Tue, 3 Aug 2010 20:45:13 +0000 (22:45 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 3 Aug 2010 20:45:13 +0000 (22:45 +0200)
commitac956293befb265b8958654d08c4ad52e605d46e
tree4fbfc08b1be8616bc5ee2032b53996ac0c5d64d8
parente9aecdec153ae166739858e6a570432449b979f7
parent7385c28e9b5f7d47e6a8f1ad9800e6e70af714e2
Merge branch 'master' of /home/wd/git/u-boot/master