Merge branch 'for-2.6.26' into for-next

Conflicts:

	drivers/md/raid5.c