merge in jb-release history after reset to master
Reconcile with ics-mr1-release

Change-Id: Ib3ccb073933d85ef50d66a0dec7836b60427708c
am d15dfc7d: Reconcile with ics-mr1-release

* commit 'd15dfc7d051bd2d6ffdaa5db56833d5b969d1e35':
tuna: prebuilt kernel

b485eed Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
6d1e480 Merge branch 'android-3.0' into android-omap-3.0
e078a22 net: wireless: bcmdhd: Add SETSUSPENDMODE command
46ec987 net: wireless: bcmdhd: Minor cleaning
ee88a6c net: wireless: bcmdhd: Add SET_RANDOM_MAC_SOFTAP option
2757c71 net: wireless: bcmdhd: Update to Version 5.90.195.30
1282ad1 net: wireless: bcmdhd: Update to Version 5.90.195.28
254c20e cfg80211: fix a crash in nl80211_send_station
6a473b4 arch: arm: modems: remove pull_up setting for phone active input pin

Change-Id: I87bcafe02e6ddbb496beac8d5ee9128ac11ddf9e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Reconcile with ics-mr1-release

Change-Id: Ibf44db9c9278138972d0c5c334d90ed8963e2ac6
am 41dded16: Reconcile with ics-mr1-release

* commit '41dded16ab5dc593c57a3b3edddfed9a8984af34':
Codec components are now dynamically configured.

Change-Id: Ife617162d1e1bb3e7102ffe1138d580a7b6f61ec
Merge "Codec components are now dynamically configured."
am 7f543ca8: am d15dfc7d: Reconcile with ics-mr1-release

* commit '7f543ca8955c275b6bbd1c22f0599873a7df69ae':
lights: remove HAL_MODULE_INFO_SYM const

HAL_MODULE_INFO_SYM was declared as read-only, but
the struct is written to by libhardware.  This causes
a segfault when -Wl,-z,relro is enabled.

Fixed.

Change-Id: I209db88c745b3f1a0d0c8f08a287b7b7debd8352
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