From: Graeme Russ <graeme.russ@gmail.com>
Date: Fri, 20 Jan 2012 14:22:48 +0000 (+1100)
Subject: Merge branch 'staging'
X-Git-Tag: v1.2~31^2~3^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=afd855d534de22aa625cb12aa9aa45e459f7de99

Merge branch 'staging'
---

afd855d534de22aa625cb12aa9aa45e459f7de99