From: David S. Miller <davem@davemloft.net>
Date: Thu, 29 Sep 2011 19:41:20 +0000 (-0400)
Subject: Merge git://github.com/Jkirsher/net-next
X-Git-Tag: MMI-PSA29.97-13-9~18194^2~191
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3869f80605847b2235b9be01e59606d9b5606d96;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://github.com/Jkirsher/net-next
---

3869f80605847b2235b9be01e59606d9b5606d96