Merge branch 'master' of ../nf-2.6
Patrick McHardy [Thu, 18 Mar 2010 11:55:50 +0000 (12:55 +0100)]
1  2 
net/bridge/netfilter/ebt_ip6.c

Simple merge