OSDN Git Service
Nick Kralevich [Tue, 28 Aug 2012 20:04:46 +0000 (13:04 -0700)]
am
7cab2188: am
ad180738: Merge "linker: Fix ARM_R_COPY relocations"
* commit '
7cab21885ac039375264a45b2c774106415be664':
linker: Fix ARM_R_COPY relocations
Nick Kralevich [Tue, 28 Aug 2012 20:01:21 +0000 (13:01 -0700)]
am
ad180738: Merge "linker: Fix ARM_R_COPY relocations"
* commit '
ad18073897378d3a13aaa6a7e7005f254ab8c1c8':
linker: Fix ARM_R_COPY relocations
Nick Kralevich [Tue, 28 Aug 2012 19:48:00 +0000 (12:48 -0700)]
Merge "linker: Fix ARM_R_COPY relocations"
Nick Kralevich [Fri, 24 Aug 2012 20:25:51 +0000 (13:25 -0700)]
linker: Fix ARM_R_COPY relocations
Per http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044d/IHI0044D_aaelf.pdf
Section 4.7.1.10, ARM_R_COPY relocations are only suppose to reference shared
libraries, not the executable itself. When resolving an R_ARM_COPY symbol,
ensure we don't look in our own symbol.
This partially addresses
http://code.google.com/p/android/issues/detail?id=28598 . After this
patch, the printfs generated by the test program are:
global = 0x42 (0x401c7000)
global = 0x42 (0x11000)
before, the output was:
global = 0x42 (0x40071000)
global = 0x0 (0x11000)
I'm still not very happy with this patch, but I think it's an improvement
over where we were at before.
This change was modeled after https://android-review.googlesource.com/38871
Change-Id: Id7ad921e58395e76a36875bcc742ec5eeba53f08
Nick Kralevich [Tue, 28 Aug 2012 17:38:28 +0000 (10:38 -0700)]
am
c7d9c400: am
c410a961: Merge "libc: remove ctors/dtors sections"
* commit '
c7d9c400126f1d1159025d1005248ab556dbdb7e':
libc: remove ctors/dtors sections
Nick Kralevich [Tue, 28 Aug 2012 17:34:14 +0000 (10:34 -0700)]
am
c410a961: Merge "libc: remove ctors/dtors sections"
* commit '
c410a9613a837790d2ea13aee3f88881e0d54c17':
libc: remove ctors/dtors sections
Nick Kralevich [Tue, 28 Aug 2012 17:20:27 +0000 (10:20 -0700)]
Merge "libc: remove ctors/dtors sections"
Nick Kralevich [Mon, 27 Aug 2012 23:08:12 +0000 (16:08 -0700)]
am
775dabd4: am
9dfaa63a: Merge "Allow linker to compile with -DLINKER_DEBUG=1"
* commit '
775dabd4d7f1c08d4229a3578d15990e86dd9c92':
Allow linker to compile with -DLINKER_DEBUG=1
Nick Kralevich [Mon, 27 Aug 2012 23:06:34 +0000 (16:06 -0700)]
am
9dfaa63a: Merge "Allow linker to compile with -DLINKER_DEBUG=1"
* commit '
9dfaa63a1c0d1b8e75dd9d7077a8103a19821fa9':
Allow linker to compile with -DLINKER_DEBUG=1
Nick Kralevich [Mon, 27 Aug 2012 23:00:50 +0000 (16:00 -0700)]
Merge "Allow linker to compile with -DLINKER_DEBUG=1"
Elliott Hughes [Mon, 27 Aug 2012 22:22:35 +0000 (15:22 -0700)]
am
d2d8031d: am
bc366292: Merge "Added missing cache failed notification"
* commit '
d2d8031df16c78b4d5bdbe481ebe6856caa69fd1':
Added missing cache failed notification
Elliott Hughes [Mon, 27 Aug 2012 22:18:52 +0000 (15:18 -0700)]
am
bc366292: Merge "Added missing cache failed notification"
* commit '
bc366292ff47ad9a5053e213ec253992baeee648':
Added missing cache failed notification
Elliott Hughes [Mon, 27 Aug 2012 22:00:51 +0000 (15:00 -0700)]
Merge "Added missing cache failed notification"
Iliyan Malchev [Mon, 27 Aug 2012 18:08:52 +0000 (11:08 -0700)]
bionic: update sanitized MSM, V4L2 kernel headers
Change-Id: I4ca8835ff7a1d21f80a139b1d76ceacf82b48502
Signed-off-by: Iliyan Malchev <malchev@google.com>
Nick Kralevich [Fri, 24 Aug 2012 20:40:25 +0000 (13:40 -0700)]
Allow linker to compile with -DLINKER_DEBUG=1
Change-Id: I27e734048cbcb9ed936369115582b3c734de1280
Ian Rogers [Fri, 24 Aug 2012 22:23:11 +0000 (15:23 -0700)]
am
05fddb41: am
a37ce7fa: Merge "Add missing va_end() to prevent stack corruptions"
* commit '
05fddb41d00710a31181693cebed570d711acd37':
Add missing va_end() to prevent stack corruptions
Ian Rogers [Fri, 24 Aug 2012 22:21:12 +0000 (15:21 -0700)]
am
a37ce7fa: Merge "Add missing va_end() to prevent stack corruptions"
* commit '
a37ce7faa6d6c7355e3c6f6e09e5268cbf29c291':
Add missing va_end() to prevent stack corruptions
Ian Rogers [Fri, 24 Aug 2012 22:10:07 +0000 (15:10 -0700)]
Merge "Add missing va_end() to prevent stack corruptions"
Rebecca Schultz Zavin [Thu, 23 Aug 2012 23:31:44 +0000 (16:31 -0700)]
Merge "Update ion header" into jb-mr1-dev
Rebecca Schultz Zavin [Thu, 23 Aug 2012 23:29:23 +0000 (16:29 -0700)]
Update ion header
Change-Id: Ib06a2c63070c9f507c14a43a0a0ac4d362f68d22
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Nick Kralevich [Thu, 23 Aug 2012 19:34:21 +0000 (12:34 -0700)]
am
e8198b97: am
26facba2: Merge "hardening: remove pointless ARM __get_pc() function"
* commit '
e8198b97c369292a3ea97e5a2009bfba8229ddb5':
hardening: remove pointless ARM __get_pc() function
Brian Carlstrom [Wed, 22 Aug 2012 19:07:33 +0000 (12:07 -0700)]
Revert "Upgrade to dlmalloc 2.8.5."
This reverts commit
999089181ef60bb67e1a49f2cf6f4ec608a7caf8.
Brian Carlstrom [Wed, 22 Aug 2012 19:07:26 +0000 (12:07 -0700)]
Revert "Restore posix_memalign"
This reverts commit
bfc1d97531fa611ad2705c7179134b60e652ead4.
Nick Kralevich [Wed, 22 Aug 2012 18:55:59 +0000 (11:55 -0700)]
am
26facba2: Merge "hardening: remove pointless ARM __get_pc() function"
* commit '
26facba288df013fd898f8df12d84e5669ece6eb':
hardening: remove pointless ARM __get_pc() function
Ard Biesheuvel [Tue, 21 Aug 2012 12:47:58 +0000 (14:47 +0200)]
libc: remove ctors/dtors sections
None of the supported ARCHs actually populate these sections,
so there is no point in keeping them in the binaries.
Change-Id: I21a364f510118ac1114e1b49c53ec8c895c6bc6b
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
Nick Kralevich [Wed, 22 Aug 2012 18:41:53 +0000 (11:41 -0700)]
Merge "hardening: remove pointless ARM __get_pc() function"
Ard Biesheuvel [Wed, 22 Aug 2012 08:37:08 +0000 (10:37 +0200)]
hardening: remove pointless ARM __get_pc() function
Useful if you're trying to defeat ASLR, otherwise not
so much ...
Change-Id: I17ebb50bb490a3967db9c3038f049adafe2b8ea7
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:32:21 +0000 (07:32 -0700)]
am
170ad354: am
c7de0225: Merge "Use unambiguous mnemonics"
* commit '
170ad35419620b428c15a8945416ce8cedef3e81':
Use unambiguous mnemonics
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:30:56 +0000 (07:30 -0700)]
am
c7de0225: Merge "Use unambiguous mnemonics"
* commit '
c7de02259052b1eeebbfd3a0c21acf56a7e84357':
Use unambiguous mnemonics
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:18:49 +0000 (07:18 -0700)]
Merge "Use unambiguous mnemonics"
Erik Gilling [Wed, 22 Aug 2012 01:17:24 +0000 (18:17 -0700)]
update linux/sync.h
Change-Id: Ic2133976b675cdcd3ca88f4845180a7ff1c79e34
Signed-off-by: Erik Gilling <konkers@android.com>
Kevin Schoedel [Fri, 29 Jun 2012 13:23:47 +0000 (09:23 -0400)]
Use unambiguous mnemonics
Change-Id: I8da0af54cc3cbf69d9e485eb71bc44a6976b1adc
Author: Kevin P Schoedel <kevin.p.schoedel@intel.com>
Reviewed-by: Edwin Vane <edwin.vane@intel.com>
Andrew Hsieh [Tue, 21 Aug 2012 10:31:02 +0000 (03:31 -0700)]
am
5cd1efb2: am
1bd035cf: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
* commit '
5cd1efb2ba68cdde13682ee37a3499b7bd974bdb':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
Andrew Hsieh [Tue, 21 Aug 2012 10:29:14 +0000 (03:29 -0700)]
am
1bd035cf: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
* commit '
1bd035cf119a2e4a667f07907c7860e5ec223cee':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
Andrew Hsieh [Tue, 21 Aug 2012 10:25:45 +0000 (03:25 -0700)]
Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
Andrew Hsieh [Tue, 21 Aug 2012 07:41:34 +0000 (15:41 +0800)]
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
Those are C funcitons
Related CL: https://android-review.googlesource.com/#/c/41833/
Change-Id: I4386bcf948ad31c3690c9b7a145103088133d041
Ian Rogers [Tue, 21 Aug 2012 02:45:12 +0000 (19:45 -0700)]
am
8af726b2: am
7b0d9b79: Merge "Restore posix_memalign"
* commit '
8af726b24fbb9ab545719bd3980a4f0ad9bcb8a8':
Restore posix_memalign
Ian Rogers [Tue, 21 Aug 2012 02:43:15 +0000 (19:43 -0700)]
am
7b0d9b79: Merge "Restore posix_memalign"
* commit '
7b0d9b798474ab62d4bf67c79ae901f4c4789f27':
Restore posix_memalign
Ian Rogers [Tue, 21 Aug 2012 02:35:25 +0000 (19:35 -0700)]
Merge "Restore posix_memalign"
Brian Carlstrom [Tue, 21 Aug 2012 01:28:20 +0000 (18:28 -0700)]
Restore posix_memalign
Change-Id: I24e31bcb8b1d8be9375852e76964f09becd11938
Brian Carlstrom [Tue, 21 Aug 2012 01:28:20 +0000 (18:28 -0700)]
Restore posix_memalign
Change-Id: I24e31bcb8b1d8be9375852e76964f09becd11938
Brian Carlstrom [Mon, 20 Aug 2012 23:31:29 +0000 (16:31 -0700)]
am
fe87596a: am
c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
fe87596a5ba5a5b0773b2854f9fce85f49367611':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:29:48 +0000 (16:29 -0700)]
am
c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
c37dcd3d3ab8e32c37ce034b8d1772b4a7b9add9':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:12:32 +0000 (16:12 -0700)]
Merge "Upgrade to dlmalloc 2.8.5."
Ian Rogers [Sat, 18 Aug 2012 00:28:15 +0000 (17:28 -0700)]
Upgrade to dlmalloc 2.8.5.
Move dlmalloc code to upstream-dlmalloc to make pulling upstream changes
easier.
Declare pvalloc and malloc_usable_size routines present in malloc.h but with
missing implementations. Remove other functions from malloc.h that have
no implementation nor use in Android.
Change-Id: Ia6472ec6cbebc9ad1ef99f4669de9d33fcc2efb4
Elliott Hughes [Fri, 17 Aug 2012 23:58:10 +0000 (16:58 -0700)]
am
2651d6c6: am
9417a80e: Merge "Always define the 64-bit int types."
* commit '
2651d6c6cbd0fafff83aafb61ab7bc9cbab413d2':
Always define the 64-bit int types.
Elliott Hughes [Fri, 17 Aug 2012 23:56:14 +0000 (16:56 -0700)]
am
9417a80e: Merge "Always define the 64-bit int types."
* commit '
9417a80e48d3bba4bea814178aaa79b905ebab8c':
Always define the 64-bit int types.
Elliott Hughes [Fri, 17 Aug 2012 23:48:14 +0000 (16:48 -0700)]
Merge "Always define the 64-bit int types."
Elliott Hughes [Fri, 17 Aug 2012 23:26:37 +0000 (16:26 -0700)]
am
cbeccc84: am
200de748: Merge "Fix race condition in pthread_create()"
* commit '
cbeccc849a45ac9adc124a6d1781c1ddc7bad54e':
Fix race condition in pthread_create()
Elliott Hughes [Fri, 17 Aug 2012 23:23:53 +0000 (16:23 -0700)]
am
200de748: Merge "Fix race condition in pthread_create()"
* commit '
200de748b91d7638a2c434584abcb3840704494b':
Fix race condition in pthread_create()
Elliott Hughes [Fri, 17 Aug 2012 23:19:56 +0000 (16:19 -0700)]
Merge "Fix race condition in pthread_create()"
Jurijs Oniscuks [Thu, 5 Jul 2012 12:57:38 +0000 (14:57 +0200)]
Fix race condition in pthread_create()
Save thread id to *thread_out before new
thread is allowed to run else there's a
risk that the thread has finished and
been deleted when *thread_out is assigned.
Change-Id: I6b84c61a8df06840877d4ab036f26feace3192d8
Elliott Hughes [Fri, 17 Aug 2012 21:30:06 +0000 (14:30 -0700)]
Always define the 64-bit int types.
These preprocessor tricks have caused trouble for -std=gnu99 and -ansi, and
both netbsd's libc and glibc seem to unconditionally define these types.
Change-Id: Ib8dffa341a8ca88f80d275ba2b7f93a4c910ee32
Elliott Hughes [Fri, 17 Aug 2012 21:01:53 +0000 (14:01 -0700)]
am
e5242bfd: am
1771a33d: Merge "Add link.h for all platforms with dl_phdr_info"
* commit '
e5242bfdd731a67282389ece515f094d57bb7300':
Add link.h for all platforms with dl_phdr_info
Elliott Hughes [Fri, 17 Aug 2012 21:00:11 +0000 (14:00 -0700)]
am
1771a33d: Merge "Add link.h for all platforms with dl_phdr_info"
* commit '
1771a33d11a24f1c47b1ef75e3726c5d9e751f5b':
Add link.h for all platforms with dl_phdr_info
Elliott Hughes [Fri, 17 Aug 2012 20:54:43 +0000 (13:54 -0700)]
Merge "Add link.h for all platforms with dl_phdr_info"
Pavel Chupin [Fri, 17 Aug 2012 08:53:29 +0000 (12:53 +0400)]
Add link.h for all platforms with dl_phdr_info
This header is used on bionic build and should be propagated into
sysroot on toolchain rebuild. Discussion re. this header is here:
http://gcc.gnu.org/ml/gcc-patches/2012-08/msg00936.html
It is available already in mips NDK platforms:
development/ndk/platforms/android-9/arch-mips/include/link.h
Change-Id: I39ff467cdac9f448e31c11ee3e14a6200e82ab57
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Henrik Engström [Wed, 20 Jun 2012 06:47:52 +0000 (08:47 +0200)]
Added missing cache failed notification
Added a missing call to _resolv_cache_query_failed for another fail
case where it was missing (it doesn't go through the error handling
under the "fail" label). This missing notification caused requests to
have to wait for timeout instead of beeing notified on some failed
requests.
Change-Id: I904d60269c59b926784e3a397d2a860329f55142
Joe Onorato [Fri, 17 Aug 2012 07:11:56 +0000 (00:11 -0700)]
am
cefb93b6: am
6c98cdb1: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
* commit '
cefb93b632fc5a65bf7620095155cc1c314e29f2':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
Joe Onorato [Fri, 17 Aug 2012 06:50:35 +0000 (23:50 -0700)]
am
6c98cdb1: Merge "Don\'t over-generalize makefiles. Host modules always build. This isn\'t needed on eng builds."
* commit '
6c98cdb1924afd3e71d39904557933fa10adaebf':
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
Joe Onorato [Fri, 17 Aug 2012 06:37:49 +0000 (23:37 -0700)]
Merge "Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds."
Joe Onorato [Thu, 16 Aug 2012 03:27:04 +0000 (20:27 -0700)]
Don't over-generalize makefiles. Host modules always build. This isn't needed on eng builds.
Change-Id: I5821ced7a8a9042fd2094204e07470d8002263ca
Elliott Hughes [Fri, 17 Aug 2012 00:05:40 +0000 (17:05 -0700)]
am
c80ca54f: am
60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
* commit '
c80ca54f3cd2d7e20770e286f4478fb589742478':
Enhance getcwd(3) to handle NULL like glibc.
Elliott Hughes [Fri, 17 Aug 2012 00:04:11 +0000 (17:04 -0700)]
am
60ef95e1: Merge "Enhance getcwd(3) to handle NULL like glibc."
* commit '
60ef95e1c1b171635adb4d11289347674b1b8987':
Enhance getcwd(3) to handle NULL like glibc.
Elliott Hughes [Thu, 16 Aug 2012 23:58:34 +0000 (16:58 -0700)]
Merge "Enhance getcwd(3) to handle NULL like glibc."
Elliott Hughes [Thu, 16 Aug 2012 22:59:12 +0000 (15:59 -0700)]
Enhance getcwd(3) to handle NULL like glibc.
Bug: http://code.google.com/p/android/issues/detail?id=36085
Change-Id: I960a1b585887eb66176c61d29c5c61c239a4003f
Elliott Hughes [Thu, 16 Aug 2012 21:23:56 +0000 (14:23 -0700)]
am
74438bb2: am
449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
* commit '
74438bb22505b55ec72224932ae9982fbf9b4b65':
bionic: add macro protection for MALLOC_ALIGNMENT
Elliott Hughes [Thu, 16 Aug 2012 19:27:47 +0000 (12:27 -0700)]
am
449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
* commit '
449d4634bea0ff8f6b29a2826871279dd654f941':
bionic: add macro protection for MALLOC_ALIGNMENT
Elliott Hughes [Thu, 16 Aug 2012 19:09:13 +0000 (12:09 -0700)]
Merge "bionic: add macro protection for MALLOC_ALIGNMENT"
Jin Wei [Wed, 1 Aug 2012 06:48:57 +0000 (14:48 +0800)]
bionic: add macro protection for MALLOC_ALIGNMENT
In previous commit:
2fd81ef7, .mk file has been modified to
configure MALLOC_ALIGNMENT dynamicly according to board config.
Add the missing macor protection here.
Change-Id: I703cca2ce0504ab3e11aab226b2c61fcc0c6afa1
Author: 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>
Scott Anderson [Thu, 16 Aug 2012 19:03:24 +0000 (12:03 -0700)]
Merge "Add clean kernel header for uhid." into jb-mr1-dev
Scott Anderson [Wed, 15 Aug 2012 21:51:12 +0000 (14:51 -0700)]
Add clean kernel header for uhid.
The original kernel header was submitted in this change:
commit
45b515c106161bb3b00d2c097504b9d44505f2d9
Author: Scott Anderson <saa@android.com>
Date: Wed Aug 15 14:52:27 2012 -0700
Add uhid original header.
This header was cherry-picked from the upstream series that ends
with patch
adefb69b1b94df29ea2df05cd838c0e032b2c473.
Change-Id: If516e41b6b14754e7feebdf062461dd38a31900a
Signed-off-by: Scott Anderson <saa@android.com>
Change-Id: I088a0df4449df859835f8267d0d2e6cd4ed3c478
Signed-off-by: Scott Anderson <saa@android.com>
Elliott Hughes [Thu, 16 Aug 2012 00:24:21 +0000 (17:24 -0700)]
am
4af9141c: am
ae728099: Merge "enable clone system call for x86"
* commit '
4af9141c5cc0989df6a1efcb10b2cfd484f2d9d2':
enable clone system call for x86
Elliott Hughes [Thu, 16 Aug 2012 00:22:50 +0000 (17:22 -0700)]
am
ae728099: Merge "enable clone system call for x86"
* commit '
ae7280994e7845037b667fd6ebdcb6f299ba1aab':
enable clone system call for x86
Elliott Hughes [Thu, 16 Aug 2012 00:08:01 +0000 (17:08 -0700)]
am
ab8850f7: am
07cd1125: Merge "Fix comment typos."
* commit '
ab8850f7e2b79914af4cf83816e9a263b9e6dec3':
Fix comment typos.
Elliott Hughes [Thu, 16 Aug 2012 00:07:59 +0000 (17:07 -0700)]
am
76aad1d2: am
e1cd69a7: Merge "Regenerate all NOTICE files with the latest version of the script."
* commit '
76aad1d2746f62aaaacdf717b4f51fa45560521d':
Regenerate all NOTICE files with the latest version of the script.
Elliott Hughes [Thu, 16 Aug 2012 00:06:53 +0000 (17:06 -0700)]
am
07cd1125: Merge "Fix comment typos."
* commit '
07cd11251f52ff8a8a98dba795f69aaa75199473':
Fix comment typos.
Elliott Hughes [Thu, 16 Aug 2012 00:06:51 +0000 (17:06 -0700)]
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.
Elliott Hughes [Thu, 16 Aug 2012 00:05:47 +0000 (17:05 -0700)]
Merge "enable clone system call for x86"
Jin Wei [Wed, 8 Aug 2012 07:15:16 +0000 (15:15 +0800)]
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
Elliott Hughes [Wed, 15 Aug 2012 23:59:21 +0000 (16:59 -0700)]
Merge "Fix comment typos."
Elliott Hughes [Wed, 15 Aug 2012 23:56:00 +0000 (16:56 -0700)]
Fix comment typos.
Change-Id: I8feeec1ee9935a6d6baebe57f1c0043ff90ff94f
Elliott Hughes [Wed, 15 Aug 2012 23:51:56 +0000 (16:51 -0700)]
Merge "Regenerate all NOTICE files with the latest version of the script."
Elliott Hughes [Wed, 15 Aug 2012 22:59:44 +0000 (15:59 -0700)]
am
9b3bbcda: am
fe43c768: Merge "Switch to the current NetBSD regex implementation."
* commit '
9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
Switch to the current NetBSD regex implementation.
Elliott Hughes [Wed, 15 Aug 2012 22:58:39 +0000 (15:58 -0700)]
am
fe43c768: Merge "Switch to the current NetBSD regex implementation."
* commit '
fe43c768ec803a1febde0424bb5e69c343dd7ae9':
Switch to the current NetBSD regex implementation.
Elliott Hughes [Wed, 15 Aug 2012 22:43:13 +0000 (15:43 -0700)]
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
Elliott Hughes [Wed, 15 Aug 2012 22:39:49 +0000 (15:39 -0700)]
Merge "Switch to the current NetBSD regex implementation."
Elliott Hughes [Tue, 14 Aug 2012 22:32:42 +0000 (15:32 -0700)]
Switch to the current NetBSD regex implementation.
Change-Id: If32b28dd85d6a7ab8957ab81d19fa4c0de9499d5
Elliott Hughes [Tue, 14 Aug 2012 22:43:57 +0000 (15:43 -0700)]
am
008a0a5d: am
53493a9b: Merge "Sort NOTICE entries."
* commit '
008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
Sort NOTICE entries.
Elliott Hughes [Tue, 14 Aug 2012 22:42:36 +0000 (15:42 -0700)]
am
53493a9b: Merge "Sort NOTICE entries."
* commit '
53493a9b26e9fb665de590abf3502af94eaf3f44':
Sort NOTICE entries.
Iliyan Malchev [Tue, 14 Aug 2012 22:40:21 +0000 (15:40 -0700)]
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
Elliott Hughes [Tue, 14 Aug 2012 22:31:17 +0000 (15:31 -0700)]
Merge "Sort NOTICE entries."
Elliott Hughes [Tue, 14 Aug 2012 22:10:51 +0000 (15:10 -0700)]
am
63696738: am
b6a97196: Merge "More cleanup."
* commit '
63696738e5d0684fb1e769c541fba2e552c5110a':
More cleanup.
Elliott Hughes [Tue, 14 Aug 2012 22:08:38 +0000 (15:08 -0700)]
am
b6a97196: Merge "More cleanup."
* commit '
b6a971962acdf2684fd98658ec6fe6aa9952d84b':
More cleanup.
Elliott Hughes [Tue, 14 Aug 2012 22:04:05 +0000 (15:04 -0700)]
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
Elliott Hughes [Tue, 14 Aug 2012 22:02:40 +0000 (15:02 -0700)]
Merge "More cleanup."
Elliott Hughes [Tue, 14 Aug 2012 21:07:59 +0000 (14:07 -0700)]
More cleanup.
Make more stuff static, remove some dead code, and fix a few typos.
Change-Id: I010b0eadeaf61e2899c37014ad1e7082c70bd510
Naseer Ahmed [Wed, 1 Aug 2012 00:26:00 +0000 (17:26 -0700)]
update msm_mdp.h header to support vsync
Change-Id: I2e8af44e430ff4955615d166bd25d7a2102ccc0f
Ajay Dudani [Thu, 9 Aug 2012 16:58:59 +0000 (09:58 -0700)]
update processed msm_camera.h and msm_isp.h
Change-Id: Ie9250a0ef888a2d1ba0b736b19fede369daeef84
Elliott Hughes [Tue, 14 Aug 2012 19:29:01 +0000 (12:29 -0700)]
am
16a0cbaa: am
b7c6991c: Merge "Update MS_ mount flags, define unshare() syscall."
* commit '
16a0cbaa83dc653a5b6a0fa62088f08cdfa4dedc':
Update MS_ mount flags, define unshare() syscall.