Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/Kconfig
Simple merge

diff --cc drivers/usb/media/dabusb.c
Simple merge

diff --cc drivers/usb/misc/auerswald.c
Simple merge

diff --cc include/linux/fs.h
Simple merge