Update usb etc

Conflicts:

	arch/arm/mach-msm/board-deluxe_j.c

Conflicts:

	arch/arm/mach-msm/board-deluxe_j.c
Update defconfig to fix undefined error