Revert "kexec: hardcode resetreason to cold restart"

This reverts commit b82d91fb5776fe5087e6da8370b905986075a85a.
default cdrom lun to 2
Merge branch 'jb-mr1' of github.com:STS-Dev-Team/kernel_mapphone_kexec into HEAD
Add edison build defconfig
remove extra ram console settings
Revert "i2c-algo-bit: Generate correct i2c address sequence for 10-bit target"

This mainline commit was breaking LIS3DH accelerometer driver for some reason

This reverts commit e8cb7517f0bfa7cdc6dd91d244f95bdcecd5589c.
turn back off emu_uart during boot if EMU_UART is disabled
Revert "turn back off emu_uart during boot if EMU_UART is disabled"

This reverts commit debbea34d27a44b3427f506fc69b7ac6c3ccaf9d.
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
stacktrace : fix fp check from moto src
[moto]add motsoc1 code
[moto]motsoc1,turn off mclk when close
[moto] init motsoc1 in board-mapphone when define macro
[moto] motsoc1 fix build break
[moto][radio]add pnx6718 g4852

Conflicts:
	drivers/usb/core/hub.c
fix usb hub build break
Merge branch 'cm-10.1' into jb-mr1

Conflicts:
	arch/arm/mach-omap2/board-mapphone.c