Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 4 Jun 2011 20:38:31 +0000 (13:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 4 Jun 2011 20:38:31 +0000 (13:38 -0700)
commite990b37b906b6137d353ef2a918e15e5763d70ec
treee802458ee43d4b0a2b6d39eb25929858ceb7fd61
parent34624d6631b6b3a1df16407a847286bb6233a96b
parent23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
net/8021q/vlan_dev.c