From: Scott Wood <scottwood@freescale.com>
Date: Fri, 14 Dec 2012 22:03:55 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v2013.01-rc3~26^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=88c5c68ffa277bf01b3254cf5a059e2cbe07be97;p=u-boot

Merge remote-tracking branch 'origin/master'
---

88c5c68ffa277bf01b3254cf5a059e2cbe07be97