Skip to content
Snippets Groups Projects
Commit 55d8ca4f authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'mv-merge' 

Conflicts:

	drivers/scsi/sata_mv.c
parents 00b6f5e9 63af2a5c
Branches
Tags
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 18 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment