]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:35:29 +0000 (11:35 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:35:29 +0000 (11:35 +0200)
commitd910dcf6c39e5b1d47ddaf60f94fcb59a8cb7322
tree15a5da3e3d92191e3d553f909829e97d4efff4b2
parentd4357337ce8991c910c349ad6703c1631c137c50
parentb0f274dc88a864ef2642bbdaa9aa4ef44c2b5c71
Merge remote-tracking branch 'block/for-next'

Conflicts:
include/linux/blk_types.h
block/blk-settings.c
drivers/block/loop.c
drivers/scsi/sd.c
fs/fscache/object.c
include/linux/bio.h
include/linux/blk_types.h