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
..
common.h	net: xen-netback: use API provided by xenbus module to map rings	2011-10-26 10:02:56 -04:00
interface.c	net: introduce and use netdev_features_t for device features sets	2011-11-16 17:43:10 -05:00
Makefile
netback.c	xen-netback: use correct index for invalidation in xen_netbk_tx_check_gop()	2011-11-21 15:32:15 -05:00
xenbus.c	Signed bit field; int have_hotplug_status_watch:1	2011-04-06 14:43:33 -07:00