From: David S. Miller <davem@davemloft.net>
Date: Wed, 9 May 2012 22:07:44 +0000 (-0400)
Subject: Merge git://1984.lsi.us.es/net-next
X-Git-Tag: for-linus-20120531~84^2~138
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a49d1a905ed96c7a790d9535e2bc62d3f2f55a05;p=linux-block.git

Merge git://1984.lsi.us.es/net-next
---

a49d1a905ed96c7a790d9535e2bc62d3f2f55a05