tree ab7ee562f31ed9fddac78c1e17a2ba9eee6cb028
parent 6eb80e00bff341dd09a7ec8b9dba6da8410448bf
parent cbb4f2646d77b536ed2b1500ef6641083228ed8f
author Linus Torvalds <torvalds@linux-foundation.org> 1249067426 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249067426 -0700

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  io context: fix ref counting
  block: make the end_io functions be non-GPL exports
  block: fix improper kobject release in blk_integrity_unregister
  block: always assign default lock to queues
  mg_disk: Add missing ready status check on mg_write()
  mg_disk: fix issue with data integrity on error in mg_write()
  mg_disk: fix reading invalid status when use polling driver
  mg_disk: remove prohibited sleep operation