From: Olof Johansson <olof@lixom.net>
Date: Fri, 28 Jun 2013 00:04:00 +0000 (-0700)
Subject: Merge branch 'msm/fixes' into next/late
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~67^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbd1a04b210d56ef84200df56fc0291746d4d4dc;p=pandora-kernel.git

Merge branch 'msm/fixes' into next/late

Merging in msm/fixes to avoid silly conflicts at top level.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

fbd1a04b210d56ef84200df56fc0291746d4d4dc
Reading git-diff-tree failed