From: Felipe Balbi <balbi@ti.com>
Date: Mon, 15 Aug 2011 16:02:25 +0000 (+0300)
Subject: Merge branch 'fixes' into for-greg
X-Git-Tag: v3.1-rc4~5^2~7^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=200b0182f95a1f97c9fefee88707fb15ce87c22d

Merge branch 'fixes' into for-greg
---

200b0182f95a1f97c9fefee88707fb15ce87c22d