David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
aoe
drbd	netlink: pass extended ACK struct to parsing functions	2017-04-13 13:58:22 -04:00
mtip32xx	mtip32xx: pass BLK_MQ_F_NO_SCHED	2017-04-19 14:15:45 -06:00
paride	scripts/spelling.txt: add "overide" pattern and fix typo instances	2017-03-09 17:01:09 -08:00
rsxx
xen-blkback
zram	zram: do not use copy_page with non-page aligned address	2017-04-13 18:24:21 -07:00
amiflop.c
ataflop.c
brd.c
cciss_cmd.h
cciss_scsi.c
cciss_scsi.h
cciss.c
cciss.h
cryptoloop.c
DAC960.c
DAC960.h
floppy.c
hd.c
Kconfig
loop.c	Merge branch 'rebased-statx' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-03-03 11:38:56 -08:00
loop.h
Makefile
mg_disk.c
nbd.c	nbd: replace kill_bdev() with __invalidate_device()	2017-03-24 15:42:47 -06:00
null_blk.c
osdblk.c
pktcdvd.c
ps3disk.c
ps3vram.c
rbd_types.h
rbd.c	rbd: supported_features bus attribute	2017-03-07 14:30:38 +01:00
skd_main.c
skd_s1120.h
smart1,2.h
sunvdc.c
swim3.c
swim_asm.S
swim.c
sx8.c
umem.c
umem.h
virtio_blk.c
xen-blkfront.c
xsysace.c
z2ram.c