From: Linus Torvalds Date: Mon, 1 Mar 2010 17:00:29 +0000 (-0800) Subject: Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block X-Git-Tag: v2.6.34-rc1~242 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1bf9368407ae7e89d8a005bb40beb70a41df539;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block * 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block: (38 commits) block: don't access jiffies when initialising io_context cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds block: fix for "Consolidate phys_segment and hw_segment limits" cfq-iosched: quantum check tweak blktrace: perform cleanup after setup error blkdev: fix merge_bvec_fn return value checks cfq-iosched: requests "in flight" vs "in driver" clarification cciss: Fix problem with scatter gather elements in the scsi half of the driver cciss: eliminate unnecessary pointer use in cciss scsi code cciss: do not use void pointer for scsi hba data cciss: factor out scatter gather chain block mapping code cciss: fix scatter gather chain block dma direction kludge cciss: simplify scatter gather code cciss: factor out scatter gather chain block allocation and freeing cciss: detect bad alignment of scsi commands at build time cciss: clarify command list padding calculation cfq-iosched: rethink seeky detection for SSDs cfq-iosched: rework seeky detection block: remove padding from io_context on 64bit builds block: Consolidate phys_segment and hw_segment limits ... --- b1bf9368407ae7e89d8a005bb40beb70a41df539