Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2011 22:04:35 +0000 (15:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2011 22:04:35 +0000 (15:04 -0700)

Trivial merge