Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 27 May 2011 17:04:40 +0000 (13:04 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 May 2011 17:04:40 +0000 (13:04 -0400)

Trivial merge