openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/xen-netback
History
David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2015-06-24 02:58:51 -07:00
..
Makefile
…
common.h xen-netback: making the bandwidth limiter runtime settable 2015-03-20 12:55:15 -04:00
interface.c xen-netback: making the bandwidth limiter runtime settable 2015-03-20 12:55:15 -04:00
netback.c net/xen-netback: Don't mix hexa and decimal with 0x in the printf format 2015-06-21 09:40:41 -07:00
xenbus.c xen-netback: fix a BUG() during initialization 2015-06-23 03:34:02 -07:00