Skip to content
Snippets Groups Projects
Commit 81b7bbd1 authored by James Bottomley's avatar James Bottomley
Browse files

Merge branch 'linus'


Conflicts:

	drivers/scsi/ipr.c

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parents 98051995 66efc5a7
No related branches found
No related tags found
Loading
Showing
with 1468 additions and 105 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 to comment