Elliott Hughes
b11eaaed35
am a870ded2
: am eaac1e5a
: am 94ce1356
: am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit 'a870ded21ac2e8b792ddc1fe1c5d71c421f0d8a1':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:09:25 -07:00
Elliott Hughes
a870ded21a
am eaac1e5a
: am 94ce1356
: am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit 'eaac1e5a1c62a9dc9edd3a858a367bbb16194272':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:08:05 -07:00
Elliott Hughes
eaac1e5a1c
am 94ce1356
: am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit '94ce135693a73ac09116dabc0f2440604bba5c87':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:06:27 -07:00
Elliott Hughes
94ce135693
am 7c92b6ca
: Merge "Remove an awkward #include that is no longer upstream."
...
* commit '7c92b6ca409f514e7ff67ac8c10d73ce92ff38d2':
Remove an awkward #include that is no longer upstream.
2012-08-06 08:04:33 -07:00
Elliott Hughes
7c92b6ca40
Merge "Remove an awkward #include that is no longer upstream."
2012-08-06 07:57:59 -07:00
The Android Automerger
7bf1c31cac
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-06 06:27:31 -07:00
Shih-wei Liao
2b7f68c03d
Revert "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
...
This reverts commit 4f1f149c37
.
2012-08-03 17:44:08 -07:00
Elliott Hughes
15b3aef581
am 8ccbc90a
: am 4bac8f68
: am 7e81ee04
: am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '8ccbc90a3b6071dff015bff284b0a11d95a00349':
Remove yet more SH4 cruft.
2012-08-03 15:17:14 -07:00
Elliott Hughes
8ccbc90a3b
am 4bac8f68
: am 7e81ee04
: am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '4bac8f689efd8f10850e60c52c206b20e4a90fd7':
Remove yet more SH4 cruft.
2012-08-03 15:14:16 -07:00
Elliott Hughes
4bac8f689e
am 7e81ee04
: am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '7e81ee04532e9c26f90d73061d9a53f09e2c3fa1':
Remove yet more SH4 cruft.
2012-08-03 15:12:39 -07:00
Elliott Hughes
7e81ee0453
am 1c861728
: Merge "Remove yet more SH4 cruft."
...
* commit '1c861728e5c8dda7589e6595f4850d77ec21a236':
Remove yet more SH4 cruft.
2012-08-03 15:09:55 -07:00
Elliott Hughes
1c861728e5
Merge "Remove yet more SH4 cruft."
2012-08-03 15:05:15 -07:00
Ajay Dudani
5f0701c9fa
Update msm_camera.h to version that supports instance handle based lookup
...
Change-Id: If33a45f378e2cbbfe28b51643808df94e8d1f5e7
2012-08-03 15:02:07 -07:00
Elliott Hughes
bbf094fdf5
Remove yet more SH4 cruft.
...
Surely this is the last piece?
Change-Id: I4bd43afb102334ec34d0e14a65c2b319826473d7
2012-08-03 14:58:18 -07:00
Elliott Hughes
031226a9fd
am 9f8c7daf
: am c9dbebe3
: am f5385754
: am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit '9f8c7daf402738beda56868692e62a90e095481d':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:34:57 -07:00
Elliott Hughes
9f8c7daf40
am c9dbebe3
: am f5385754
: am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'c9dbebe344d2f6a4623a67d1c005bcb6137642c4':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:33:20 -07:00
Elliott Hughes
c9dbebe344
am f5385754
: am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'f5385754e29dcb093cb9445c40b69e45bd71d685':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:29:45 -07:00
Elliott Hughes
f5385754e2
am aea5f00d
: Merge "bionic: modify syscall to use 6 registers to pass parameter."
...
* commit 'aea5f00df4704a618331e16473b552e54bed269b':
bionic: modify syscall to use 6 registers to pass parameter.
2012-08-03 14:27:08 -07:00
Elliott Hughes
aea5f00df4
Merge "bionic: modify syscall to use 6 registers to pass parameter."
2012-08-03 13:55:56 -07:00
Jin Wei
c164f2a969
bionic: modify syscall to use 6 registers to pass parameter.
...
Kernel allows to use 6 registers(exclude eax) to pass parameter.
But in syscall's implementation, it only uses five registers.
It will lead to error when 6 parameters passed.
Change-Id: I92d663194e6334c3847f0c0c257ca3b9dee0edef
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>
Author-tracking-BZ: 30838
2012-08-03 13:54:29 -07:00
Elliott Hughes
7478b0bfa6
am 58234e78
: am 48955d24
: am c6f15ecf
: am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit '58234e788be30a16e6ba745adc21cbfd6d9828ec':
Upgrade to tzdata2012e.
2012-08-03 13:41:39 -07:00
Elliott Hughes
58234e788b
am 48955d24
: am c6f15ecf
: am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit '48955d24b9f3e8c15028a6dbb54e2e96fd41780a':
Upgrade to tzdata2012e.
2012-08-03 13:39:38 -07:00
Elliott Hughes
48955d24b9
am c6f15ecf
: am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit 'c6f15ecf76842801db653d58a262c7d342be2a93':
Upgrade to tzdata2012e.
2012-08-03 13:33:15 -07:00
Elliott Hughes
c6f15ecf76
am 1510795f
: Merge "Upgrade to tzdata2012e."
...
* commit '1510795fec5aa8b8700a08200f37f6e57dea8d04':
Upgrade to tzdata2012e.
2012-08-03 13:30:44 -07:00
Elliott Hughes
1510795fec
Merge "Upgrade to tzdata2012e."
2012-08-03 12:30:18 -07:00
Elliott Hughes
094651335e
Upgrade to tzdata2012e.
...
Includes this change:
* australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14.
(Thanks to Steffen Thorsen.)
Change-Id: I51bfab759f424b90daeb1960c6cfb2b55b78ff46
2012-08-03 12:26:06 -07:00
David Turner
65f12237b8
am c7813c08
: am d7552a31
: am 2f2b7212
: am 16d40217
: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
...
* commit 'c7813c08570a5e6ef3e410973d7f4b4befebee77':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:04:06 -07:00
David Turner
c7813c0857
am d7552a31
: am 2f2b7212
: am 16d40217
: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
...
* commit 'd7552a3101affbc531f3c33deca10c28417a864c':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:02:00 -07:00
David Turner
d7552a3101
am 2f2b7212
: am 16d40217
: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
...
* commit '2f2b72120489d9e7e67a97a059a731aa72a34f72':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 05:00:03 -07:00
David Turner
2f2b721204
am 16d40217
: Merge "Fix the clang build: this compiler doesn\'t support the gnu_inline function attribute"
...
* commit '16d40217d05a1d9ad8ec475ce5f68c35bbef7029':
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
2012-08-03 04:57:56 -07:00
David Turner
16d40217d0
Merge "Fix the clang build: this compiler doesn't support the gnu_inline function attribute"
2012-08-03 04:40:37 -07:00
Shih-wei Liao
4f1f149c37
Fix the clang build: this compiler doesn't support the gnu_inline function attribute
...
Recent clang compiler doesn't have gnu_inline working. When frameworks/rs
is compiled with clang instead of gcc, it no longer works. Will be fixed
by this patch.
Change-Id: I8b281a1305151909e18958b73914ea27343cb4cd
2012-08-03 04:38:15 -07:00
Elliott Hughes
889a706637
am df7aa950
: am 9b6a4538
: am 0ce92b96
: am 1e304a3b
: Merge "[MIPS] Support for TLS register"
...
* commit 'df7aa95031f5f99ba3fc95956c38bf7ffd037ab4':
[MIPS] Support for TLS register
2012-08-02 18:51:38 -07:00
Elliott Hughes
df7aa95031
am 9b6a4538
: am 0ce92b96
: am 1e304a3b
: Merge "[MIPS] Support for TLS register"
...
* commit '9b6a45386555a11aa1c7f473b21c480b4a158ea7':
[MIPS] Support for TLS register
2012-08-02 18:49:12 -07:00
Elliott Hughes
9b6a453865
am 0ce92b96
: am 1e304a3b
: Merge "[MIPS] Support for TLS register"
...
* commit '0ce92b9625c5d0cc4e72047e6c8759c4cc079dcb':
[MIPS] Support for TLS register
2012-08-02 18:48:04 -07:00
Elliott Hughes
0ce92b9625
am 1e304a3b
: Merge "[MIPS] Support for TLS register"
...
* commit '1e304a3bce347da08f0f9409829d911493bad1bb':
[MIPS] Support for TLS register
2012-08-02 18:45:56 -07:00
Elliott Hughes
1e304a3bce
Merge "[MIPS] Support for TLS register"
2012-08-02 18:33:20 -07:00
Elliott Hughes
bdcc14d721
Remove an awkward #include that is no longer upstream.
...
This was causing trouble in https://android-review.googlesource.com/#/c/37590/ .
Change-Id: Ib7cb4fbaef6e9c1470c59f67d24bd24c7ce90bcc
2012-08-02 18:12:36 -07:00
Raghu Gandham
1c30398143
[MIPS] Support for TLS register
...
Change-Id: I6b5194e5e379b573e3b1203d8015e20fb3edd647
Signed-off-by: Chris Dearman <chris@mips.com>
2012-08-02 18:01:05 -07:00
Elliott Hughes
855a3779be
am e5bd6efa
: am f94effda
: am fd4685be
: am 52f3ee96
: Merge "MIPS support for libc."
...
* commit 'e5bd6efa0805a743ed6c2022c65c5a8ff79d7310':
MIPS support for libc.
2012-08-02 16:39:18 -07:00
Elliott Hughes
e5bd6efa08
am f94effda
: am fd4685be
: am 52f3ee96
: Merge "MIPS support for libc."
...
* commit 'f94effdab27f2bbe3f079d454e71ca9e60166318':
MIPS support for libc.
2012-08-02 16:37:07 -07:00
Elliott Hughes
f94effdab2
am fd4685be
: am 52f3ee96
: Merge "MIPS support for libc."
...
* commit 'fd4685be87fa2c957d4f95deb75a6ba763fd7339':
MIPS support for libc.
2012-08-02 16:34:57 -07:00
Elliott Hughes
fd4685be87
am 52f3ee96
: Merge "MIPS support for libc."
...
* commit '52f3ee962b384bf247638adb653f0024ce92a895':
MIPS support for libc.
2012-08-02 16:32:47 -07:00
Elliott Hughes
52f3ee962b
Merge "MIPS support for libc."
2012-08-02 16:14:47 -07:00
Elliott Hughes
36c27b547e
am 79d834b5
: am 82dcfee5
: am 19e30fc4
: am a1c0f08d
: Merge "Fix a ENOTUP/ENOTSUP typo."
...
* commit '79d834b5aba80407046ece1377033c8d48fbd427':
Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:13:40 -07:00
Elliott Hughes
967c9f7fcb
am 422067eb
: am c0719660
: am 670766c5
: am 994935f6
: Merge "Error numbers are target specific."
...
* commit '422067eb3ceba3c39903df5562cb8997b40d61c4':
Error numbers are target specific.
2012-08-02 16:13:38 -07:00
Elliott Hughes
79d834b5ab
am 82dcfee5
: am 19e30fc4
: am a1c0f08d
: Merge "Fix a ENOTUP/ENOTSUP typo."
...
* commit '82dcfee5fcd5243ff9df2aa7497e83dd567b6f95':
Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:10:34 -07:00
Elliott Hughes
422067eb3c
am c0719660
: am 670766c5
: am 994935f6
: Merge "Error numbers are target specific."
...
* commit 'c07196605cc9bb55af2173832536e342e902d2c5':
Error numbers are target specific.
2012-08-02 16:10:32 -07:00
Elliott Hughes
82dcfee5fc
am 19e30fc4
: am a1c0f08d
: Merge "Fix a ENOTUP/ENOTSUP typo."
...
* commit '19e30fc41030ab0524134b097dfef88baea14f4a':
Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:07:41 -07:00
Elliott Hughes
c07196605c
am 670766c5
: am 994935f6
: Merge "Error numbers are target specific."
...
* commit '670766c5649086ad5ffe26c0deadeb460139202f':
Error numbers are target specific.
2012-08-02 16:07:40 -07:00