[GIT PULL] Follow up block fixes

[Jens Axboe <jaxboe@fusionio.com>]

Hi Linus,

Mainly pushing this a bit early to resolve an oops that has been
reported by Eric Dumazet. Some good fixes apart from that, though,
Namhyung Kim has been busy fixing oopsable conditions in brd, loop,
and nbd. The latter is not in yet. Most patches are stable candidates.

- Fix floppy regression from Tejun
- brd/loop fixes from Namhyung Kim
- Removal of an only-written variable in bio_attempt_front_merge()
- Export blk_{get,put}_queue() for the SCSI fix
- Fix oops shortly after boot reported by Eric.


Please pull.

  git://git.kernel.dk/linux-2.6-block.git for-linus

Jens Axboe (2):
      block: fix oops on !disk->queue and sysfs discard alignment display
      block: export blk_{get,put}_queue()

Luca Tettamanti (1):
      block: remove unused variable in bio_attempt_front_merge()

Namhyung Kim (6):
      brd: get rid of unused members from struct brd_device
      brd: limit 'max_part' module param to DISK_MAX_PARTS
      brd: handle on-demand devices correctly
      brd: fix comment on initial device creation
      brd: export module parameters
      loop: export module parameters

Tejun Heo (1):
      block: always allocate genhd->ev if check_events is implemented

 block/blk-core.c      |    5 ++---
 block/genhd.c         |    2 +-
 drivers/block/brd.c   |   42 ++++++++++++++++++++++++++----------------
 drivers/block/loop.c  |   17 ++++++++++++++---
 fs/partitions/check.c |    8 +++++---
 5 files changed, 48 insertions(+), 26 deletions(-)

-- 
Jens Axboe