tree ba5a8fe8e2373744edc22974571a953840d6c9e8
parent 544ae5f96e14998cabc637fa20cf409eb92a0dd0
parent b706f64281b24d8b1fdc8ae883700131d365c412
author Linus Torvalds <torvalds@linux-foundation.org> 1246470069 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1246470069 -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:
  cfq-iosched: remove redundant check for NULL cfqq in cfq_set_request()
  blocK: Restore barrier support for md and probably other virtual devices.
  block: get rid of queue-private command filter
  block: Create bip slabs with embedded integrity vectors
  cfq-iosched: get rid of the need for __GFP_NOFAIL in cfq_find_alloc_queue()
  cfq-iosched: move cfqq initialization out of cfq_find_alloc_queue()
  Trivial typo fixes in Documentation/block/data-integrity.txt.