]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 02:17:01 +0000 (12:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 02:17:01 +0000 (12:17 +1000)
commitbf89e85223b20913415e6125f66c59b7be0532f9
tree8642461c1b77da9ae0dc7fdabf619c7e7ed42d7f
parente782b6d10f93b11a22099be7b29d7c37530bac66
parent6478f7987951f6070080643788bda2164622be6c
Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/block/virtio_blk.c
drivers/block/ataflop.c
drivers/block/floppy.c
drivers/char/random.c
drivers/mtd/mtd_blkdevs.c
drivers/mtd/ubi/block.c
drivers/scsi/scsi_lib.c
include/linux/blk_types.h