From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Jan 2012 20:48:41 +0000 (-0800)
Subject: Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=16008d641670571ff4cd750b416c7caf2d89f467;p=~shefty%2Frdma-dev.git

Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

* 'for-3.3/drivers' of git://git.kernel.dk/linux-block:
  mtip32xx: do rebuild monitoring asynchronously
  xen-blkfront: Use kcalloc instead of kzalloc to allocate array
  mtip32xx: uninitialized variable in mtip_quiesce_io()
  mtip32xx: updates based on feedback
  xen-blkback: convert hole punching to discard request on loop devices
  xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io
  xen/blk[front|back]: Enhance discard support with secure erasing support.
  xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together
  mtip32xx: update to new ->make_request() API
  mtip32xx: add module.h include to avoid conflict with moduleh tree
  mtip32xx: mark a few more items static
  mtip32xx: ensure that all local functions are static
  mtip32xx: cleanup compat ioctl handling
  mtip32xx: fix warnings/errors on 32-bit compiles
  block: Add driver for Micron RealSSD pcie flash cards
---

16008d641670571ff4cd750b416c7caf2d89f467