From: Linus Torvalds Date: Mon, 28 Mar 2011 03:02:07 +0000 (-0700) Subject: Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8d49a77568d1;p=deliverable%2Flinux.git Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block * 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block: (122 commits) cciss: fix lost command issue drbd: need include for bitops functions declarations Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation" cciss: fix missed command status value CMD_UNABORTABLE cciss: remove unnecessary casts cciss: Mask off error bits of c->busaddr in cmd_special_free when calling pci_free_consistent cciss: Inform controller we are using 32-bit tags. cciss: hoist tag masking out of loop cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation cciss: export resettable host attribute drbd: drop code present under #ifdef which is relevant to 2.6.28 and below drbd: Fixed handling of read errors on a 'VerifyS' node drbd: Fixed handling of read errors on a 'VerifyT' node drbd: Implemented real timeout checking for request processing time drbd: Remove unused function atodb_endio() drbd: improve log message if received sector offset exceeds local capacity drbd: kill dead code drbd: don't BUG_ON, if bio_add_page of a single page to an empty bio fails drbd: Removed left over, now wrong comments drbd: serialize admin requests for new verify run with pending bitmap io ... --- 8d49a77568d1105ff3e64aec484dac059f54824e