From: Patrick McHardy Date: Tue, 18 Jan 2011 15:20:53 +0000 (+0100) Subject: Merge branch 'master' of git://dev.medozas.de/linux X-Git-Tag: MMI-PSA29.97-13-9~20520^2~510^2~3 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a8fc0d9b3401cb5e42a437293db383998290157d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'master' of git://dev.medozas.de/linux --- a8fc0d9b3401cb5e42a437293db383998290157d