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

into kroah.com:/home/greg/linux/BK/usb-2.6

diff --cc arch/arm/configs/neponset_defconfig
Simple merge

diff --cc arch/ia64/configs/generic_defconfig
Simple merge

diff --cc arch/ia64/configs/zx1_defconfig
Simple merge

diff --cc arch/ia64/defconfig
Simple merge

diff --cc arch/parisc/configs/c3000_defconfig
Simple merge

diff --cc arch/ppc/configs/common_defconfig
Simple merge

diff --cc arch/ppc/configs/pmac_defconfig
Simple merge

diff --cc arch/ppc/defconfig
Simple merge

diff --cc arch/ppc64/configs/pSeries_defconfig
Simple merge

diff --cc arch/ppc64/defconfig
Simple merge

diff --cc drivers/usb/core/message.c
Simple merge