Commit 10a5fd5e authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' 

Conflicts:

	drivers/scsi/libata-scsi.c
	include/linux/libata.h
parents c2a65852 a145410d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment