From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 22 Aug 2011 22:33:01 +0000 (+0100)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: Ubuntu-5.2.0-15.16~18854^2~785
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=09d930ae5198fbb67b86d3d058ad82211f469a46;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'for-3.1' into for-3.2
---

09d930ae5198fbb67b86d3d058ad82211f469a46