diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:32:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:32:11 -0800 |
| commit | 456eac94789e1b512515e6974e091ef655f343de (patch) | |
| tree | 79f277d02e5e480a373c129bdce7564421d360c7 /drivers/Makefile | |
| parent | dedd0c2a48d1eb779373de5eddd04a3e059ce540 (diff) | |
| parent | f06f135d8642e2f6812cfcb4ea8e4e9122d4d58c (diff) | |
| download | linux-456eac94789e1b512515e6974e091ef655f343de.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
fs/bio.c: fix shadows sparse warning
drbd: The kernel code is now equivalent to out of tree release 8.3.7
drbd: Allow online resizing of DRBD devices while peer not reachable (needs to be explicitly forced)
drbd: Don't go into StandAlone mode when authentification failes because of network error
drivers/block/drbd/drbd_receiver.c: correct NULL test
cfq-iosched: Respect ioprio_class when preempting
genhd: overlapping variable definition
block: removed unused as_io_context
DM: Fix device mapper topology stacking
block: bdev_stack_limits wrapper
block: Fix discard alignment calculation and printing
block: Correct handling of bottom device misaligment
drbd: check on CONFIG_LBDAF, not LBD
drivers/block/drbd: Correct NULL test
drbd: Silenced an assert that could triggered after changing write ordering method
drbd: Kconfig fix
drbd: Fix for a race between IO and a detach operation [Bugz 262]
drbd: Use drbd_crypto_is_hash() instead of an open coded check
Diffstat (limited to 'drivers/Makefile')
0 files changed, 0 insertions, 0 deletions