]> git.dujemihanovic.xyz Git - u-boot.git/commit
projects / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6636b62) | patch
Fix my own merge stupidity
authorAndy Fleming <afleming@freescale.com>
Wed, 9 Jan 2008 19:51:32 +0000 (13:51 -0600)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jan 2008 22:13:00 +0000 (23:13 +0100)
commit02df4a270f817ef6ec39047a01b55fecdc5f3b37
tree52c2d6090912b294ec20cc7d724c7269bde8ff9ctree | snapshot
parent6636b62a6efc7f14e6e788788631ae7a7fca4537commit | diff
Fix my own merge stupidity

Way back in August I merged Heiko's patch:
566a494f592: [PCS440EP] upgrade the PCS440EP board

with Jon's CONFIG_COMMANDS patches.

This was done in commit: 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78

However, in the process, I left out some of Heiko's good changes.

Now Heiko's and Jon's patches are properly merged in fat_register_device()

Signed-off-by: Andy Fleming <afleming@freescale.com>
fs/fat/fat.c diff | blob | history
My U-Boot fork