Merge branch 'master' of git://1984.lsi.us.es/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Jan 2011 20:34:21 +0000 (12:34 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Jan 2011 20:34:21 +0000 (12:34 -0800)

Trivial merge