Merge branch 'for-2.6.26' into for-next
authorNeil Brown <neilb@suse.de>
Thu, 10 Jul 2008 06:51:26 +0000 (16:51 +1000)
committerNeil Brown <neilb@suse.de>
Thu, 10 Jul 2008 06:51:26 +0000 (16:51 +1000)
commitf9f278fefdbbbf198bb4111b3fba47d9043dae59
tree97941f31c713ddb4a5882a81af891fc1e9cc92e3
parent35020f1a06edade6f52fc8349e150d95cdf7fd90
parent7a1fc53c5adb910751a9b212af90302eb4ffb527
Merge branch 'for-2.6.26' into for-next

Conflicts:

drivers/md/raid5.c