David S. Miller 88c5100c28 Merge branch 'master' of github.com:davem330/net ...

Conflicts:
	net/batman-adv/soft-interface.c

2011-10-07 13:38:43 -04:00

..

common.h

xen: netback: use __CONST_RING_SIZE not __RING_SIZE

2011-05-17 15:27:35 -04:00

interface.c

net: xen-netback: correctly restart Tx after a VM restore/migrate

2011-10-03 14:15:46 -04:00

Makefile

…

netback.c

xen: netback: convert to SKB paged frag API.

2011-10-05 17:36:00 -04:00

xenbus.c

Signed bit field; int have_hotplug_status_watch:1

2011-04-06 14:43:33 -07:00