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

00e375e7

Commit 00e375e7 authored 14 years ago by Jens Axboe

Downloads
- Plain Diff

Merge branch 'for-2.6.37/drivers' into for-linus


Conflicts:
	drivers/block/cciss.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

parents f85acd81 4205df34

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

drivers/block/cciss.c 59 additions, 69 deletions

drivers/block/cciss.c
drivers/block/cciss.h 4 additions, 0 deletions

drivers/block/cciss.h
drivers/block/drbd/drbd_actlog.c 23 additions, 19 deletions

drivers/block/drbd/drbd_actlog.c
drivers/block/drbd/drbd_int.h 23 additions, 27 deletions

drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_main.c 85 additions, 63 deletions

drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_nl.c 19 additions, 6 deletions

drivers/block/drbd/drbd_nl.c
drivers/block/drbd/drbd_proc.c 0 additions, 1 deletion

drivers/block/drbd/drbd_proc.c
drivers/block/drbd/drbd_receiver.c 33 additions, 184 deletions

drivers/block/drbd/drbd_receiver.c
drivers/block/drbd/drbd_req.c 17 additions, 21 deletions

drivers/block/drbd/drbd_req.c
drivers/block/drbd/drbd_worker.c 1 addition, 22 deletions

drivers/block/drbd/drbd_worker.c
include/linux/drbd.h 1 addition, 1 deletion

include/linux/drbd.h

with 265 additions and 413 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