am f7cbe5c5: am c66e68a5: (-s ours) am 55c6dbb8: am aaa6f18b: am 5a0bb29c: am cfc09248: (-s ours) am 07f11e34: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f7cbe5c5514072d5e63b50dce9437fcc5264bd38':
am ab8c4bed: am 97a19b67: Merge "new kernel prebuilt" into jb-mr2-dev

* commit 'ab8c4bedb7c4d5472b2da105cf55b0388dff651e':
am 0e579469: am 3d193481: Merge "Manta: NFC: Enable UICC_IDLE timeout feature." into jb-mr2-dev

* commit '0e5794695571d139a811cb4c16713f869e128dc4':
am 73d30dd3: am 7a733d20: Merge "prebuilt kernel (3.4.5 to 3.4.35; strace fix; async ion_free)" into jb-mr2-dev

* commit '73d30dd38fd55d8921c6c27f44fb87c71a0e502f':
am 224ecba4: am 477d1c47: Merge "Use dumpstate directly for bugreports." into jb-mr2-dev

* commit '224ecba4246d9abc70901908da0ee468697adde4':
am cc3290fa: am 58b4ca03: Revert "Manta: NFC: Enable UICC_IDLE timeout feature."

* commit 'cc3290faa4a5020c28dbd1eed14d9f22ade1118b':
am 4d79fc4b: am 09c3fa14: Merge "Update cache sizes for the new unified path cache" into jb-mr2-dev

* commit '4d79fc4bcff22789e541ae190ace4892a8cf5d88':
am fb86952c: am eb82cff5: Merge "Rename texture cache flush rate property" into jb-mr2-dev

* commit 'fb86952c3228e5d0e335607352f9bfecd6e2eabb':
am e0edde42: am 36463e5c: am 0a284958: am 0d12b8f0: Merge "Initial security policy."

* commit 'e0edde427037a804d0cb36b8f5bba2f826ec7a77':
am ad552300: am dfa60f1c: manta: prebuilt kernel (interactive governor iowait etc., tracing options)

* commit 'ad55230026b66d6e99d8fc9e37627e993606ceef':
am a0561dd3: am 8e3f8daa: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'a0561dd34724e667b138fd3b42cd004b04b2bc01':
am 8958602b: am 2b8f8ddf: am b5052953: manta: wifi: Remove obsolete path to P2P FW

* commit '8958602b855d59b6cb26dcd3a683ed18db8c2b5e':
am 4545a265: am 20ea5e78: am fd6664ea: am 5db0e029: am b2ab4b85: Merge "Remove unused samsung/manta ARCH_ARM_HAVE_TLS_REGISTER."

* commit '4545a265d09174759feb937978756dcff78f3fc6':
am 76c6d431: am c6611237: am 1f7068e3: manta: treat iowait as busy for cpufreq interactive governor

* commit '76c6d431aaf5fb95c4964f5b0f5fe33f8774bf80':
am 953962b1: am 866c6e22: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '953962b1f3e6e035217f1d297c03bb3ff703c57c':
am 8678a917: am b2795465: am 49737d1b: Rename AOSP builds to aosp_*

* commit '8678a91796c6ce8899bb01f774aad164db0c819c':
am 4ba394a3: am 2ade23b5: am b9d27dd5: new kernel prebuilt

* commit '4ba394a3f5633ca1146ada17a325f053085363bb':
am 56a06089: am 316f294b: am f81ccfe7: manta: wifi: Disable spuravoid feature in FW

* commit '56a06089eeb2aad4c73788058ac0cdd6198485c1':
am 1a8847ec: am 143d65dd: am 57854854: Merge "Manta: NFC: Re-enable UICC idle timeout feature." into jb-mr2-dev

* commit '1a8847ecbdd014ec69d9e38b9bbca4a5f5b304d9':
am 757136b9: am 44922415: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '757136b9c8bee0f3715570fdf7f16516d31654b4':