Merge branch 'master' of /repos/git/net-next-2.6
[safe/jmp/linux-2.6] / drivers / net / macvtap.c
2010-02-04 Arnd Bergmannnet: macvtap driver