Elliott Hughes
ab8850f7e2
am 07cd1125
: Merge "Fix comment typos."
...
* commit '07cd11251f52ff8a8a98dba795f69aaa75199473':
Fix comment typos.
2012-08-15 17:06:53 -07:00
Elliott Hughes
76aad1d274
am e1cd69a7
: Merge "Regenerate all NOTICE files with the latest version of the script."
...
* commit 'e1cd69a708d30fbc3b9e0e8d4db67f67fc123b65':
Regenerate all NOTICE files with the latest version of the script.
2012-08-15 17:06:51 -07:00
Elliott Hughes
ae7280994e
Merge "enable clone system call for x86"
2012-08-15 17:05:47 -07:00
Jin Wei
22d366cc09
enable clone system call for x86
...
Add __bionic_clone function for x86, which will be
used for clone system call.
Change-Id: I889dc9bf4b7ebb4358476e17e6f3233e26491f4d
Signed-off-by: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 51414
2012-08-15 17:04:50 -07:00
Elliott Hughes
07cd11251f
Merge "Fix comment typos."
2012-08-15 16:59:21 -07:00
Elliott Hughes
105bc26fa6
Fix comment typos.
...
Change-Id: I8feeec1ee9935a6d6baebe57f1c0043ff90ff94f
2012-08-15 16:56:00 -07:00
Elliott Hughes
e1cd69a708
Merge "Regenerate all NOTICE files with the latest version of the script."
2012-08-15 16:51:56 -07:00
Elliott Hughes
0681b2e477
am f53c75e5
: am 2e3756b4
: am 9b3bbcda
: am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit 'f53c75e513cb088d712badc32b89a8792a329d63':
Switch to the current NetBSD regex implementation.
2012-08-15 16:03:03 -07:00
Elliott Hughes
f53c75e513
am 2e3756b4
: am 9b3bbcda
: am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit '2e3756b4d36c9b7f6a892b87757d41b3201b9773':
Switch to the current NetBSD regex implementation.
2012-08-15 16:01:22 -07:00
Elliott Hughes
2e3756b4d3
am 9b3bbcda
: am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit '9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
Switch to the current NetBSD regex implementation.
2012-08-15 15:59:44 -07:00
Elliott Hughes
9b3bbcda84
am fe43c768
: Merge "Switch to the current NetBSD regex implementation."
...
* commit 'fe43c768ec803a1febde0424bb5e69c343dd7ae9':
Switch to the current NetBSD regex implementation.
2012-08-15 15:58:39 -07:00
Elliott Hughes
32dbc03c73
Regenerate all NOTICE files with the latest version of the script.
...
This sorts every entry, so we should have more stability and fewer
merge conflicts in future.
Change-Id: Ifc5347dc53352da22c82d41ca59b483966fcfc6b
2012-08-15 15:43:13 -07:00
Elliott Hughes
fe43c768ec
Merge "Switch to the current NetBSD regex implementation."
2012-08-15 15:39:49 -07:00
Elliott Hughes
cc213f871b
Switch to the current NetBSD regex implementation.
...
Change-Id: If32b28dd85d6a7ab8957ab81d19fa4c0de9499d5
2012-08-15 15:39:11 -07:00
The Android Open Source Project
c05ca5f058
am e24cde44
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e24cde4406792ee57f5dbfaa1efc35131f289063':
2012-08-15 08:29:17 -07:00
The Android Open Source Project
e24cde4406
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2f6d32a6bc10f17d85930b21c2ac55c91d5e252e
2012-08-15 08:26:11 -07:00
The Android Automerger
46bb2a222e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-15 06:33:26 -07:00
Elliott Hughes
cc9f4d56c0
am ff45d5cd
: am 82259117
: am 008a0a5d
: am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit 'ff45d5cdbfc4117d69fc688f12ec251297eb8751':
Sort NOTICE entries.
2012-08-14 15:47:31 -07:00
Elliott Hughes
ff45d5cdbf
am 82259117
: am 008a0a5d
: am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit '82259117753adffdab3ce74efb12d30a5289ad2b':
Sort NOTICE entries.
2012-08-14 15:46:26 -07:00
Elliott Hughes
8225911775
am 008a0a5d
: am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit '008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
Sort NOTICE entries.
2012-08-14 15:43:57 -07:00
Iliyan Malchev
422bb8b5c4
am 912dd712
: am df88d88f
: Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* commit '912dd71259959a259478465296438e83d0ad8e64':
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:43:18 -07:00
Elliott Hughes
008a0a5d50
am 53493a9b
: Merge "Sort NOTICE entries."
...
* commit '53493a9b26e9fb665de590abf3502af94eaf3f44':
Sort NOTICE entries.
2012-08-14 15:42:36 -07:00
Iliyan Malchev
912dd71259
am df88d88f
: Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* commit 'df88d88f56f37cdf75ab03c6b68a42010d9ac6c7':
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:41:38 -07:00
Iliyan Malchev
df88d88f56
Merge changes I2e8af44e,Ie9250a0e into jb-mr1-dev
...
* changes:
update msm_mdp.h header to support vsync
update processed msm_camera.h and msm_isp.h
2012-08-14 15:40:21 -07:00
Elliott Hughes
53493a9b26
Merge "Sort NOTICE entries."
2012-08-14 15:31:18 -07:00
Elliott Hughes
ea4900b89a
am 0a3f66e9
: am fdbecf3b
: am 63696738
: am b6a97196
: Merge "More cleanup."
...
* commit '0a3f66e9a0ef47dc2f751292a69434405221ef90':
More cleanup.
2012-08-14 15:14:56 -07:00
Elliott Hughes
0a3f66e9a0
am fdbecf3b
: am 63696738
: am b6a97196
: Merge "More cleanup."
...
* commit 'fdbecf3b5a16f8e35e1ad67ec9c807eb66e2ac3b':
More cleanup.
2012-08-14 15:13:10 -07:00
Elliott Hughes
fdbecf3b5a
am 63696738
: am b6a97196
: Merge "More cleanup."
...
* commit '63696738e5d0684fb1e769c541fba2e552c5110a':
More cleanup.
2012-08-14 15:10:51 -07:00
Elliott Hughes
63696738e5
am b6a97196
: Merge "More cleanup."
...
* commit 'b6a971962acdf2684fd98658ec6fe6aa9952d84b':
More cleanup.
2012-08-14 15:08:38 -07:00
Elliott Hughes
261e2232c1
Sort NOTICE entries.
...
Also make sure we get the whole of any copyright header, in case
there's text before the "Copyright" line.
Change-Id: Iabcc5e0931a39c0107b833539fec7c5a3d134592
2012-08-14 15:04:05 -07:00
Elliott Hughes
b6a971962a
Merge "More cleanup."
2012-08-14 15:02:40 -07:00
Elliott Hughes
bedfe38b8b
More cleanup.
...
Make more stuff static, remove some dead code, and fix a few typos.
Change-Id: I010b0eadeaf61e2899c37014ad1e7082c70bd510
2012-08-14 14:07:59 -07:00
Naseer Ahmed
056b4bc499
update msm_mdp.h header to support vsync
...
Change-Id: I2e8af44e430ff4955615d166bd25d7a2102ccc0f
2012-08-14 12:51:42 -07:00
Ajay Dudani
77b25702ba
update processed msm_camera.h and msm_isp.h
...
Change-Id: Ie9250a0ef888a2d1ba0b736b19fede369daeef84
2012-08-14 12:51:42 -07:00
Elliott Hughes
8af9d9a7d0
am 7bb37492
: am 89a35435
: am 16a0cbaa
: am b7c6991c
: Merge "Update MS_ mount flags, define unshare() syscall."
...
* commit '7bb37492cc371e9bbca68406af1b94ae1348fe3c':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:33:05 -07:00
Elliott Hughes
7bb37492cc
am 89a35435
: am 16a0cbaa
: am b7c6991c
: Merge "Update MS_ mount flags, define unshare() syscall."
...
* commit '89a3543568ffedb54473f961f36f17d211d9c7e1':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:31:15 -07:00
Elliott Hughes
89a3543568
am 16a0cbaa
: am b7c6991c
: Merge "Update MS_ mount flags, define unshare() syscall."
...
* commit '16a0cbaa83dc653a5b6a0fa62088f08cdfa4dedc':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:29:01 -07:00
Elliott Hughes
16a0cbaa83
am b7c6991c
: Merge "Update MS_ mount flags, define unshare() syscall."
...
* commit 'b7c6991c9af3882bd13cbf6bc42da85c884aa5f5':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:27:44 -07:00
Elliott Hughes
6bdc30e923
am 028ed539
: am dc320d99
: am 82b69fcb
: am b9c6854c
: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit '028ed539ddbe577687ac9778382c98aab3bf279f':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:21:21 -07:00
Elliott Hughes
a10b277de2
am bfcd5525
: am b6d6ec53
: am 370a7094
: am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit 'bfcd55250058e927e0c6d0b94337c89fc2d86fa2':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:21:20 -07:00
Elliott Hughes
028ed539dd
am dc320d99
: am 82b69fcb
: am b9c6854c
: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit 'dc320d99f1e09c0e42fc86f3cb28c15b77d7701b':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:17:27 -07:00
Elliott Hughes
bfcd552500
am b6d6ec53
: am 370a7094
: am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit 'b6d6ec5326a016e60d2bd82edf857aaec6d5ce95':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:17:26 -07:00
Elliott Hughes
b7c6991c9a
Merge "Update MS_ mount flags, define unshare() syscall."
2012-08-14 12:14:29 -07:00
Elliott Hughes
dc320d99f1
am 82b69fcb
: am b9c6854c
: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit '82b69fcbb3cc94bcde82c72d5c66fb3b504cdb6e':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:14:13 -07:00
Elliott Hughes
b6d6ec5326
am 370a7094
: am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit '370a70948ad56046f685ffda34ead8ae88dcad2a':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:14:12 -07:00
Elliott Hughes
82b69fcbb3
am b9c6854c
: Merge "linker: avoid clobbering the .dynamic section of shared libs"
...
* commit 'b9c6854cd9d5286f991aec66be3a8a57f5e3e7be':
linker: avoid clobbering the .dynamic section of shared libs
2012-08-14 12:11:54 -07:00
Elliott Hughes
370a70948a
am c50e0197
: Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."
...
* commit 'c50e019734fb379e2efc1d50e188dd51cf085b96':
Switch to upstream NetBSD tdelete/tfind/tsearch.
2012-08-14 12:11:53 -07:00
Jeff Sharkey
0febe091a5
am 21f7ef9e
: am d8450043
: Merge "Update MS_ mount flags, define unshare() syscall." into jb-mr1-dev
...
* commit '21f7ef9eb269f75d7c291b4c574eabc865bf4362':
Update MS_ mount flags, define unshare() syscall.
2012-08-14 12:11:01 -07:00
Jeff Sharkey
74c0464006
Update MS_ mount flags, define unshare() syscall.
...
(cherry-pick of 82393decdfc6b0383054fb5d2f54725bbee88b8c.)
Bug: 6925012
Change-Id: I4f962d8975ad62ff4b9983150f9e481796092b9d
2012-08-14 12:09:25 -07:00
Elliott Hughes
b9c6854cd9
Merge "linker: avoid clobbering the .dynamic section of shared libs"
2012-08-14 12:07:18 -07:00