am 3ed1461d: (-s ours) am f088ef91: (-s ours) Reconcile with jb-mr2-zeroday-deb-release - do not merge

* commit '3ed1461d3589a38e162414e50371c621ea17e591':
  Restart, cleanup or retry inactve connections.
am 35c5dd72: (-s ours) am 38aaaa64: (-s ours) am 1b4c3db6: Merge "RIL: Support SMS on IMS, DO NOT MERGE" into jb-mr2-dev

* commit '35c5dd72d8a28a384e54393955e60a352a425f7e':
  RIL: Support SMS on IMS, DO NOT MERGE
am 3492c6e5: Change PDP_FAIL_SIGNAL_LOST to be retryable.

* commit '3492c6e5917828645feb3dba4618629929a43ab1':
  Change PDP_FAIL_SIGNAL_LOST to be retryable.
am a18b9d1e: RIL: Support SMS over IMS

* commit 'a18b9d1e1a014290691d63a7f335085dadc83e46':
  RIL: Support SMS over IMS
am 865ce3b4: Fix documenation IMS registration state.

* commit '865ce3b4a2ba0b3a31421ca671f4d6c5595f8690':
  Fix documenation IMS registration state.
Stop the kernel complaining about rild.

Even if you're only using capabilities that reside in the bottom 32-bits,
the kernel complains unless you're on __LINUX_CAPABILITY_VERSION_3.

  warning: `rild' uses 32-bit capabilities (legacy support in use)

Change-Id: I6512cbc158971eb950e0fc2554e95fde72023cb2
Merge "Stop the kernel complaining about rild."
am 478bfb9a: Merge "Stop the kernel complaining about rild."

* commit '478bfb9aad83c2c6e91d54c80f88dd44211c2576':
  Stop the kernel complaining about rild.
Remove an outdated hack.

This is still a waste of your main thread, though.

Change-Id: Ic904619b2e1065b2bab577070a73f8175c1a48f3
Merge "Remove an outdated hack."
am 740edfcf: Merge "Remove an outdated hack."

* commit '740edfcffce965294256bab23c49dcde799dfeda':
  Remove an outdated hack.
Remove references to <linux/omap_csmi.h>.

This header no longer exists in modern kernels, and it looks like
this code was only meant to be enabled for 'sooner' anyway.

Change-Id: I6e7449a31942a54daa925c14e8843752a835bd42
am 56865265: am 478bfb9a: Merge "Stop the kernel complaining about rild."

* commit '568652651ec5121891c80d1096b54ee917550a21':
  Stop the kernel complaining about rild.
am a8975de9: am 56865265: am 478bfb9a: Merge "Stop the kernel complaining about rild."

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

* commit '6b49c02448cf54f5bee6955cb6e42b54febf108e':
  Remove an outdated hack.
am 72356f14: am 6b49c024: am 740edfcf: Merge "Remove an outdated hack."

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

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

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