Merge "lights: remove HAL_MODULE_INFO_SYM const"
am 46949ccf: am 41dded16: Reconcile with ics-mr1-release

* commit '46949ccf275eff5cccbfc7b706a3498157e2ce70':
tuna: prebuilt kernel -- DO NOT MERGE

cea631b [MMC] Patch the firmware of certain Samsung emmc parts to fix a bug
e638e26 arch: arm: modems: remove pull_up setting for phone active input pin

Change-Id: I8fcd868fef56c98884cc19d9999f84f62e968a95
Signed-off-by: Ken Sumrall <ksumrall@android.com>
tuna: prebuilt kernel

3c57a61 [MMC] Patch the firmware of certain Samsung emmc parts to fix a bug

Change-Id: I4fad35abc792cec39d1364e9136d0f1b323d5883
Signed-off-by: Ken Sumrall <ksumrall@android.com>
am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGE

* commit 'a71cfea22241a46bf0c33c7357f2fa062ea6a74c':
  tuna: prebuilt kernel -- DO NOT MERGE
am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGE

* commit 'a71cfea22241a46bf0c33c7357f2fa062ea6a74c':
  tuna: prebuilt kernel -- DO NOT MERGE
am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGE

* commit 'a71cfea22241a46bf0c33c7357f2fa062ea6a74c':
  tuna: prebuilt kernel -- DO NOT MERGE
am 2df8da89: am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGE

* commit '2df8da89313523e10fcfc7a23d87deba85233b54':
  tuna: prebuilt kernel -- DO NOT MERGE
am d62a468c: am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGE

* commit 'd62a468c77a16ee54a7b0732329ecb5952149c4b':
am da112516: (-s ours) am 2df8da89: am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGE

* commit 'da112516f89d3911fba4b7de2cc39e420b73b39f':
  tuna: prebuilt kernel -- DO NOT MERGE
am 6e16dd4a: (-s ours) am d62a468c: am a71cfea2: tuna: prebuilt kernel -- DO NOT MERGE

* commit '6e16dd4aa2d6def684452458661b4fd6b4f930b3':
merge in ics-mr1-release history after reset to ics-mr1
Reconcile with ics-mr1-release

Change-Id: I602b2ccaa21c6e74464986286524fd48fb95e620
am 97026117: Reconcile with ics-mr1-release

* commit '97026117389ce210f0dbacc4d3fcc408c98b8db2':
am 3b862b18: am 97026117: Reconcile with ics-mr1-release

* commit '3b862b18347c16aa792ab17e9c7f7ae2ff008838':
Reconcile with ics-mr1-release

Change-Id: I968168c66180efa5016376f1142227c614b99a4f
am 3a1e624a: Reconcile with ics-mr1-release

* commit '3a1e624a65a89fe0d9c26025a1c6ee206710c7db':
am 95e70959: am 3a1e624a: Reconcile with ics-mr1-release

* commit '95e709593524b029c2f89c355b6dc552764724b4':
merge in jb-release history after reset to master
require bootloader PRIMELB02

Change-Id: Id652f4c1e817caf1436d95c4030088e837a1ac5f