linux_old1/drivers/s390
David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/xen-netfront.c

Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-15 00:53:17 -05:00
..
block Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
char Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
cio s390/eadm: change timeout value 2014-12-08 09:42:42 +01:00
crypto s390/zcrypt: kernel oops at insmod of the z90crypt device driver 2014-12-18 09:55:55 +01:00
kvm virtio_ccw: finalize_features error handling 2014-12-09 21:42:06 +02:00
net net: rename vlan_tx_* helpers since "tx" is misleading there 2015-01-13 17:51:08 -05:00
scsi scsi: drop reason argument from ->change_queue_depth 2014-11-24 14:45:27 +01:00
Makefile