Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

c1152949

Commit c1152949 authored 15 years ago by Jens Axboe

Downloads
- Plain Diff

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

parents 08d869aa 367a8d73

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

drivers/block/drbd/Kconfig 1 addition, 1 deletion

drivers/block/drbd/Kconfig
drivers/block/drbd/drbd_main.c 1 addition, 0 deletions

drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_nl.c 1 addition, 1 deletion

drivers/block/drbd/drbd_nl.c
drivers/block/drbd/drbd_receiver.c 5 additions, 4 deletions

drivers/block/drbd/drbd_receiver.c

with 8 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment