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)
commit52f2ede1ced85040f00d0dc70dad2d4ae7c46aa6
tree78ea559eb497667a9f676657403f18df2535c917
parentbd97120fc3d1a11f3124c7c9ba1d91f51829eb85
parent4a6dd664eba59488c9e56b51a594396d7706eb08
Merge branch 'master' of git://1984.lsi.us.es/nf

An interface name overflow fix in netfilter via Pablo Neira Ayuso.

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