David S. Miller 6dec4ac4ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/inet_diag.c		2011-11-26 14:47:03 -05:00
..
ehea	ehea: Use round_jiffies_relative to align workqueue	2011-11-23 19:14:20 -05:00
emac	ibm/emac: fix improper cleanup when device is removed to allow re-bind	2011-11-17 17:04:57 -05:00
ibmveth.c	net: introduce and use netdev_features_t for device features sets	2011-11-16 17:43:10 -05:00
ibmveth.h
iseries_veth.c	iseries_veth: Fix wrong parameter given to sizeof call	2011-11-21 14:56:35 -05:00
Kconfig
Makefile