From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 10 Jul 2007 20:49:46 +0000 (-0700)
Subject: Merge branch 'trivial-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: firefly_0821_release~28354
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5cbc39a726eafa1198c18adb3cf56ccee371dba1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'trivial-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block

* 'trivial-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block:
  Documentation/block/barrier.txt is not in sync with the actual code: - blk_queue_ordered() no longer has a gfp_mask parameter - blk_queue_ordered_locked() no longer exists - sd_prepare_flush() looks slightly different
  Use list_for_each_entry() instead of list_for_each() in the block device
  Make a "menuconfig" out of the Kconfig objects "menu, ..., endmenu",
  block/Kconfig already has its own "menuconfig" so remove these
  Use menuconfigs instead of menus, so the whole menu can be disabled at once
  cfq-iosched: fix async queue behaviour
  unexport bio_{,un}map_user
  Remove legacy CDROM drivers
  [PATCH] fix request->cmd == INT cases
  cciss: add new controller support for P700m
  [PATCH] Remove acsi.c
  [BLOCK] drop unnecessary bvec rewinding from flush_dry_bio_endio
  [PATCH] cdrom_sysctl_info fix
  blk_hw_contig_segment(): bad segment size checks
  [TRIVIAL PATCH] Kill blk_congestion_wait() stub for !CONFIG_BLOCK
---

5cbc39a726eafa1198c18adb3cf56ccee371dba1