From: Olof Johansson <olof@lixom.net>
Date: Tue, 13 Dec 2011 20:18:29 +0000 (-0800)
Subject: Merge branch 'ux500/devel' into next/devel
X-Git-Tag: v3.3-rc1~139^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1dc9fff73be3103fb1049bc2d66086f980e005b8;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'ux500/devel' into next/devel
---

1dc9fff73be3103fb1049bc2d66086f980e005b8