Merge bk://linuxusb.bkbits.net/pci_hp-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux