tree 7756753c37db84c1dd6cde1c99487f10e8a63878
parent 9ef38eaf4289a99beb3bc13d1ded220a68cc8877
parent fa2fc7f4813bfec1ae3232d49e3befbd601e8a6f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1203436982 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1203436982 -0800

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  libata: implement drain buffers
  libata: eliminate the home grown dma padding in favour of
  block: clear drain buffer if draining for write command
  block: implement request_queue->dma_drain_needed
  block: add request->raw_data_len
  block: update bio according to DMA alignment padding
  libata: update ATAPI overflow draining
  elevator: make elevator_get() attempt to load the appropriate module
  cfq-iosched: add hlist for browsing parallel to the radix tree
  block: make blk_rq_map_user() clear ->bio if it unmaps it
  fs/block_dev.c: remove #if 0'ed code
  make struct def_blk_aops static
  make blk_settings_init() static
  make blk_ioc_init() static
  make blk-core.c:request_cachep static again