| commit | 34c27a497ab0e9ca28eb1bd572907ba8a154ad50 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 27 20:02:45 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 27 20:02:45 2011 -0700 |
| tree | d736a9846a5d1b5be1fe3dc0622843d8dfd2ead4 | |
| parent | 8d49a77568d1105ff3e64aec484dac059f54824e [diff] | |
| parent | 0b58b4e3e711aed17aa26fafd01be137f6a1ab2e [diff] |
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