Remove monarudo files
m7 updates

Conflicts:

	arch/arm/mach-msm/board-deluxe_j-regulator.c
	arch/arm/mach-msm/board-deluxe_j.c
cleanup of perflock

Conflicts:

	arch/arm/mach-msm/board-deluxe_j.c
update board files and remove bcm4335 references

Conflicts:

	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-deluxe_j-storage.c
	arch/arm/mach-msm/board-deluxe_j.c
	arch/arm/mach-msm/board-monarudo-rfkill.c
revert usb fix since it doesn't work trying something else

Conflicts:

	arch/arm/configs/apq8064_defconfig
	arch/arm/mach-msm/include/mach/htc_usb.h
fix build
pull in usb stuff from m7

Conflicts:

	arch/arm/mach-msm/board-deluxe_j.c
updates to board monarudo from m7

Conflicts:

	arch/arm/mach-msm/board-deluxe_j.c
derp derp fix orientation
revert these

Conflicts:

	arch/arm/mach-msm/board-deluxe_j.c
fix usb like a bawse =)
updates fix buildy
begin backporting battery from m7
updates

Conflicts:

	arch/arm/configs/apq8064_defconfig
fix build
Actually boot please

Conflicts:

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