From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Mar 2011 03:02:45 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.39-rc1~36
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=34c27a497ab0e9ca28eb1bd572907ba8a154ad50

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  staging: Fix bdops->check_events() misconversion in cyasblkdev_block.c
  ide: ensure that we re-run the queue handler
---

34c27a497ab0e9ca28eb1bd572907ba8a154ad50