tree db072bbccffd1f1c6b1269ac7a752cb30af3a726
parent 39b4a46f19295b4876fba6655f27d67232dc6a1f
parent e3a57b3ccf5c04934ac43b5b80e32ba51b817288
author Linus Torvalds <torvalds@linux-foundation.org> 1307142686 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1307142686 +0900

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: Use hlist_entry() for io_context.cic_list.first
  cfq-iosched: Remove bogus check in queue_fail path
  xen/blkback: potential null dereference in error handling
  xen/blkback: don't call vbd_size() if bd_disk is NULL
  block: blkdev_get() should access ->bd_disk only after success
  CFQ: Fix typo and remove unnecessary semicolon
  block: remove unwanted semicolons
  Revert "block: Remove extra discard_alignment from hd_struct."
  nbd: adjust 'max_part' according to part_shift
  nbd: limit module parameters to a sane value
  nbd: pass MSG_* flags to kernel_recvmsg()
  block: improve the bio_add_page() and bio_add_pc_page() descriptions