From: David S. Miller <davem@davemloft.net>
Date: Thu, 13 Jan 2011 02:58:40 +0000 (-0800)
Subject: Merge branch 'master' of git://1984.lsi.us.es/net-2.6
X-Git-Tag: v2.6.38-rc1~50^2~25
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=464143c911df98d4913932534485113a0a14aa74;p=pandora-kernel.git

Merge branch 'master' of git://1984.lsi.us.es/net-2.6
---

464143c911df98d4913932534485113a0a14aa74