From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 23 Nov 2011 20:30:08 +0000 (+0000)
Subject: Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes
X-Git-Tag: MMI-PSA29.97-13-9~17947^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=56f54e7d671969da13693e5a147438f2cc50ca9b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes
---

56f54e7d671969da13693e5a147438f2cc50ca9b