Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus

Browse source

...

This commit is contained in:

Jens Axboe 2009-12-31 10:00:27 +01:00

parent 08d869aa86 367a8d7385

commit c1152949bb

4 changed files with 8 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/block/drbd/Kconfig

View file

1

drivers/block/drbd/drbd_main.c

View file

2

drivers/block/drbd/drbd_nl.c

View file

9

drivers/block/drbd/drbd_receiver.c

View file