Merge kroah.com:/home/greg/linux/BK/bleed-2.5

into kroah.com:/home/greg/linux/BK/gregkh-2.5

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/serial/digi_acceleport.c
Simple merge

diff --cc drivers/usb/serial/usb-serial.c
Simple merge

diff --cc drivers/usb/serial/whiteheat.c
Simple merge