David S. Miller d5ef8a4d87 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/infiniband/hw/nes/nes_cm.c Simple whitespace conflict. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-02-10 23:32:28 -05:00
..
Kconfig	MII: fix Kconfig dependencies for MII	2011-09-15 15:49:08 -04:00
Makefile
via-rhine.c	netdev: ethernet dev_alloc_skb to netdev_alloc_skb	2012-02-08 18:46:38 -05:00
via-velocity.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-10 23:32:28 -05:00
via-velocity.h