From: Wolfgang Denk <wd@denx.de>
Date: Fri, 17 Feb 2012 22:52:52 +0000 (+0100)
Subject: Merge branch 'trini@ti.com' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2012.04-rc1~155
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dbe20fc79736d4f99a9bfaafeae600c9348504df;p=oweals%2Fu-boot.git

Merge branch 'trini@ti.com' of git://git.denx.de/u-boot-staging

* 'trini@ti.com' of git://git.denx.de/u-boot-staging:
  usb_ether: fix typo
  cmd_eeprom: typo
  doc: complete, typos
---

dbe20fc79736d4f99a9bfaafeae600c9348504df