Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Sat, 4 Jun 2011 20:38:31 +0000 (13:38 -0700)]
1  2 
net/8021q/vlan_dev.c

Simple merge