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

Trivial merge