tree 97941f31c713ddb4a5882a81af891fc1e9cc92e3
parent 35020f1a06edade6f52fc8349e150d95cdf7fd90
parent 7a1fc53c5adb910751a9b212af90302eb4ffb527
author Neil Brown <neilb@suse.de> 1215672686 +1000
committer Neil Brown <neilb@suse.de> 1215672686 +1000

Merge branch 'for-2.6.26' into for-next

Conflicts:

	drivers/md/raid5.c