Merge bk://ldm.bkbits.net/linux-2.5-driverfs-api

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

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/scsi/sr.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge

diff --cc fs/partitions/check.c
Simple merge