From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 4 Aug 2011 17:04:12 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~864^2~132^2~63
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c25bdbe2886327aedc2248c7227931eaee483f25;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'master' of git://git./linux/kernel/git/gregkh/staging-2.6
---

c25bdbe2886327aedc2248c7227931eaee483f25