From: Neil Brown <neilb@suse.de>
Date: Thu, 10 Jul 2008 06:51:26 +0000 (+1000)
Subject: Merge branch 'for-2.6.26' into for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f9f278fefdbbbf198bb4111b3fba47d9043dae59;p=linux.git

Merge branch 'for-2.6.26' into for-next

Conflicts:

	drivers/md/raid5.c
---

f9f278fefdbbbf198bb4111b3fba47d9043dae59