Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/md-merge

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

diff --cc drivers/md/linear.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/multipath.c
Simple merge

diff --cc drivers/md/raid0.c
Simple merge

diff --cc drivers/md/raid1.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc include/linux/raid/raid5.h
Simple merge