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

Browse source

...

This commit is contained in:

Jens Axboe 2009-11-04 18:38:23 +01:00

parent 476d42f138 ed814525f2

commit 622d32d3ec

6 changed files with 22 additions and 18 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

7

drivers/block/drbd/drbd_main.c

View file

14

drivers/block/drbd/drbd_nl.c

View file

6

drivers/block/drbd/drbd_receiver.c

View file

7

drivers/block/drbd/drbd_req.c

View file

2

include/linux/drbd.h

View file

4

include/linux/drbd_limits.h

View file