am 56865265: am 478bfb9a: Merge "Stop the kernel complaining about rild."

* commit '568652651ec5121891c80d1096b54ee917550a21':
  Stop the kernel complaining about rild.
am 6b49c024: am 740edfcf: Merge "Remove an outdated hack."

* commit '6b49c02448cf54f5bee6955cb6e42b54febf108e':
  Remove an outdated hack.
am 6a775fe2: am eb90dbe8: Merge "Remove references to <linux/omap_csmi.h>."

* commit '6a775fe2ff760239ddce5d20813518ef8944d3cc':
  Remove references to <linux/omap_csmi.h>.
am 2c464b0d: Merge commit \'a18b9d1e1a014290691d63a7f335085dadc83e46\' into HEAD

* commit '2c464b0d9dbc759e4021b90029c4224adc1c8851':
am d78be248: Merge "RIL changes for supporting generic SIM communication."

* commit 'd78be248d253e6a5c46749b78d16115d547ab272':
  RIL changes for supporting generic SIM communication.
am 2e52ae0e: Merge commit \'865ce3b4a2ba0b3a31421ca671f4d6c5595f8690\' into HEAD

* commit '2e52ae0ec0aa3564a49f245ef4720b78cd5abaeb':
am dbff9519: Merge "Send unsol_sim_status on radio_state change"

* commit 'dbff95192afde6cf20d7d73b716f705329d0da7a':
  Send unsol_sim_status on radio_state change
am 710f0c82: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error."

* commit '710f0c82afb8d1660539b74d7f4c137b0644b799':
  Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.
am af03f928: Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."

* commit 'af03f9284c7e775df8feeef6eb96ffb039949e9a':
  Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.
am c4801e78: Merge "Fix parameter mismatch between header and implementation"

* commit 'c4801e78cc7b75a744a45a2a855503daca5bf0f3':
  Fix parameter mismatch between header and implementation
am 21538d94: Merge "Fix pthread_create error handling in ril."

* commit '21538d9410d3d04cc15f08a3a25b5f2501a70f9e':
  Fix pthread_create error handling in ril.
am dcb3334c: Merge "Fix pthread_create error handling in ril harder."

* commit 'dcb3334ce57f28a525d7e86222d4c7c6e3907ba3':
  Fix pthread_create error handling in ril harder.
am 2f29fdb8: Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"

* commit '2f29fdb8a8cb7f624801d35ab108f0321030c61b':
  Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE
am ebdf40e6: Merge "reference-ril: fix LP64 warnings"

* commit 'ebdf40e65a17e8758c059a736425cd47563cdace':
  reference-ril: fix LP64 warnings
am 458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"

* commit '458d8b7e11c39e550106f50866103936530a6e11':
  [RIL] Fix build-break when enabling RILC_LOG
am c6bb9727: Merge "[RIL] 64-bit compile issues"

* commit 'c6bb97274337f55fec2e7f33aec7acc9de117ddf':
  [RIL] 64-bit compile issues
Merge commit 'f884b7a14aebd9804c259b40f2aff7d69acf2ea9' into HEAD
am 8e7ff420: Merge "Remove unused LOCAL_LDLIBS."

* commit '8e7ff420ca742d050ebac3f1956055ed97e429ff':
  Remove unused LOCAL_LDLIBS.
auto-merger: merge in from aosp/master