Merge branch 'master' of git://1984.lsi.us.es/nf
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Nov 2012 16:29:43 +0000 (11:29 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Nov 2012 16:29:43 +0000 (11:29 -0500)
An interface name overflow fix in netfilter via Pablo Neira Ayuso.

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge