Commit f9f278fe authored by Neil Brown's avatar Neil Brown

Merge branch 'for-2.6.26' into for-next

Conflicts:

	drivers/md/raid5.c
parents 35020f1a 7a1fc53c
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment