From: Chris Metcalf Date: Fri, 6 Aug 2010 14:37:02 +0000 (-0400) Subject: Merge branch 'master' into for-linus X-Git-Tag: MMI-PSA29.97-13-9~23004^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab11b487402f97975f3ac1eeea09c82f4431481e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'master' into for-linus --- ab11b487402f97975f3ac1eeea09c82f4431481e