OSDN Git Service
The Android Automerger [Tue, 13 May 2014 12:50:33 +0000 (05:50 -0700)]
merge in master-release history after reset to
38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Mon, 12 May 2014 12:49:50 +0000 (05:49 -0700)]
merge in master-release history after reset to
38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Sun, 11 May 2014 12:49:55 +0000 (05:49 -0700)]
merge in master-release history after reset to
38a3f7de2450fcffd4bd88cc869329f3d17a9996
The Android Automerger [Sat, 10 May 2014 12:50:41 +0000 (05:50 -0700)]
merge in master-release history after reset to
38a3f7de2450fcffd4bd88cc869329f3d17a9996
Ying Wang [Thu, 8 May 2014 18:24:00 +0000 (18:24 +0000)]
am
16d99d6d: am
f3a5fb23: am
8e7ff420: Merge "Remove unused LOCAL_LDLIBS."
* commit '
16d99d6d5334b5079732c651eaf1cb434084862f':
Remove unused LOCAL_LDLIBS.
The Android Automerger [Thu, 8 May 2014 12:50:37 +0000 (05:50 -0700)]
merge in master-release history after reset to
cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
Ying Wang [Wed, 7 May 2014 23:01:12 +0000 (23:01 +0000)]
am
f3a5fb23: am
8e7ff420: Merge "Remove unused LOCAL_LDLIBS."
* commit '
f3a5fb23a77e942a154d357299a84e5b14863b0c':
Remove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:54:24 +0000 (22:54 +0000)]
am
8e7ff420: Merge "Remove unused LOCAL_LDLIBS."
* commit '
8e7ff420ca742d050ebac3f1956055ed97e429ff':
Remove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:49:54 +0000 (22:49 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Wed, 7 May 2014 22:30:50 +0000 (15:30 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: Id93e486c16cfce8be120a136ff798631e540c89e
The Android Automerger [Wed, 7 May 2014 16:11:17 +0000 (09:11 -0700)]
merge in master-release history after reset to
cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Wed, 7 May 2014 12:50:30 +0000 (05:50 -0700)]
merge in master-release history after reset to
cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Tue, 6 May 2014 12:50:31 +0000 (05:50 -0700)]
merge in master-release history after reset to
cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Mon, 5 May 2014 12:50:01 +0000 (05:50 -0700)]
merge in master-release history after reset to
cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Sun, 4 May 2014 12:49:53 +0000 (05:49 -0700)]
merge in master-release history after reset to
cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Sat, 3 May 2014 12:50:58 +0000 (05:50 -0700)]
merge in master-release history after reset to
cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Thu, 1 May 2014 12:50:32 +0000 (05:50 -0700)]
merge in master-release history after reset to
cfaea7ea3ce54d82c7ecda09553c5e96add67b4b
The Android Automerger [Wed, 30 Apr 2014 12:50:51 +0000 (05:50 -0700)]
merge in master-release history after reset to
b8805e75ef4b4a014e7a42158018a79f87cce654
Bill Yi [Wed, 30 Apr 2014 12:50:30 +0000 (12:50 +0000)]
Bill Yi [Wed, 30 Apr 2014 00:59:12 +0000 (00:59 +0000)]
Bill Yi [Tue, 29 Apr 2014 18:34:22 +0000 (11:34 -0700)]
The Android Automerger [Tue, 29 Apr 2014 12:50:35 +0000 (05:50 -0700)]
merge in master-release history after reset to
b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Mon, 28 Apr 2014 12:49:48 +0000 (05:49 -0700)]
merge in master-release history after reset to
b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Sun, 27 Apr 2014 12:49:51 +0000 (05:49 -0700)]
merge in master-release history after reset to
b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Sat, 26 Apr 2014 12:51:19 +0000 (05:51 -0700)]
merge in master-release history after reset to
b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Thu, 24 Apr 2014 12:51:50 +0000 (05:51 -0700)]
merge in master-release history after reset to
b8805e75ef4b4a014e7a42158018a79f87cce654
The Android Automerger [Sat, 19 Apr 2014 12:50:29 +0000 (05:50 -0700)]
merge in master-release history after reset to master
Mohamad Ayyash [Fri, 18 Apr 2014 21:18:40 +0000 (21:18 +0000)]
am
02a2bf2c: am
e145607b: Merge "rild: Fix a sizeof bug."
* commit '
02a2bf2c86e129d23137635935b197c4d2b95299':
rild: Fix a sizeof bug.
Mohamad Ayyash [Fri, 18 Apr 2014 21:15:32 +0000 (21:15 +0000)]
am
e145607b: Merge "rild: Fix a sizeof bug."
* commit '
e145607bb74c037dbe38b6351f2457ea23ee3160':
rild: Fix a sizeof bug.
Mohamad Ayyash [Fri, 18 Apr 2014 18:49:49 +0000 (18:49 +0000)]
Merge "rild: Fix a sizeof bug."
Mohamad Ayyash [Fri, 18 Apr 2014 18:43:28 +0000 (11:43 -0700)]
rild: Fix a sizeof bug.
Change-Id: Ic207f8b1567849051f24342e37f905a59b43dad2
Mohamad Ayyash [Fri, 18 Apr 2014 18:43:28 +0000 (11:43 -0700)]
rild: Fix a sizeof bug.
Change-Id: Ic207f8b1567849051f24342e37f905a59b43dad2
Mark Salyzyn [Thu, 13 Mar 2014 15:54:51 +0000 (15:54 +0000)]
am
c6bb9727: Merge "[RIL] 64-bit compile issues"
* commit '
c6bb97274337f55fec2e7f33aec7acc9de117ddf':
[RIL] 64-bit compile issues
The Android Automerger [Thu, 13 Mar 2014 12:50:40 +0000 (05:50 -0700)]
merge in master-release history after reset to master
Mark Salyzyn [Wed, 12 Mar 2014 23:37:18 +0000 (23:37 +0000)]
am
1a206079: am
c6bb9727: Merge "[RIL] 64-bit compile issues"
* commit '
1a2060792f2a867422b51c0e4d352d8d3804e613':
[RIL] 64-bit compile issues
Mark Salyzyn [Wed, 12 Mar 2014 23:29:08 +0000 (23:29 +0000)]
am
c6bb9727: Merge "[RIL] 64-bit compile issues"
* commit '
c6bb97274337f55fec2e7f33aec7acc9de117ddf':
[RIL] 64-bit compile issues
Mark Salyzyn [Wed, 12 Mar 2014 23:19:43 +0000 (23:19 +0000)]
Merge "[RIL] 64-bit compile issues"
Mark Salyzyn [Wed, 12 Mar 2014 22:20:22 +0000 (15:20 -0700)]
[RIL] 64-bit compile issues
- size_t use %zu format
- All in RLOG, so zero functional impact
- suppress unused argument warnings
Change-Id: I99d7221a13de6f12bfcf93ef8fe4521669f1f783
Etan Cohen [Tue, 11 Mar 2014 18:17:11 +0000 (18:17 +0000)]
am
458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"
* commit '
458d8b7e11c39e550106f50866103936530a6e11':
[RIL] Fix build-break when enabling RILC_LOG
Colin Cross [Fri, 7 Mar 2014 02:23:47 +0000 (02:23 +0000)]
am
ebdf40e6: Merge "reference-ril: fix LP64 warnings"
* commit '
ebdf40e65a17e8758c059a736425cd47563cdace':
reference-ril: fix LP64 warnings
The Android Automerger [Sat, 1 Mar 2014 13:50:48 +0000 (05:50 -0800)]
merge in master-release history after reset to master
Etan Cohen [Fri, 28 Feb 2014 19:35:26 +0000 (19:35 +0000)]
am
680bdfa7: am
458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"
* commit '
680bdfa726292c466f4cf68363b29f8781c3fb63':
[RIL] Fix build-break when enabling RILC_LOG
Etan Cohen [Fri, 28 Feb 2014 19:27:58 +0000 (19:27 +0000)]
am
458d8b7e: Merge "[RIL] Fix build-break when enabling RILC_LOG"
* commit '
458d8b7e11c39e550106f50866103936530a6e11':
[RIL] Fix build-break when enabling RILC_LOG
Etan Cohen [Fri, 28 Feb 2014 19:23:46 +0000 (19:23 +0000)]
Merge "[RIL] Fix build-break when enabling RILC_LOG"
Etan Cohen [Fri, 28 Feb 2014 01:25:17 +0000 (17:25 -0800)]
[RIL] Fix build-break when enabling RILC_LOG
A couple of debug messages were using out-of-date struct
members causing the build to break when the RILC_LOG flag
was enabled.
Change-Id: I258a58744aa3c71ddbe09e598221c149be59b554
Jake Hamby [Thu, 6 Feb 2014 22:52:05 +0000 (14:52 -0800)]
Remove unneeded new RIL command.
Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also, space out the NV item enum values so we can add new items per category.
Bug:
12864208
Change-Id: I0831b8495d06065e96239ef74d67342daa7b3743
Jake Hamby [Thu, 6 Feb 2014 22:52:05 +0000 (14:52 -0800)]
Remove unneeded new RIL command.
Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also, space out the NV item enum values so we can add new items per category.
Bug:
12864208
Change-Id: I0831b8495d06065e96239ef74d67342daa7b3743
Colin Cross [Thu, 6 Feb 2014 07:51:30 +0000 (07:51 +0000)]
am
221b96c9: am
ebdf40e6: Merge "reference-ril: fix LP64 warnings"
* commit '
221b96c92083a624659b8f2c17bcd61eb04b3f98':
reference-ril: fix LP64 warnings
Colin Cross [Thu, 6 Feb 2014 07:42:04 +0000 (07:42 +0000)]
am
ebdf40e6: Merge "reference-ril: fix LP64 warnings"
* commit '
ebdf40e65a17e8758c059a736425cd47563cdace':
reference-ril: fix LP64 warnings
Colin Cross [Thu, 6 Feb 2014 07:33:19 +0000 (07:33 +0000)]
Merge "reference-ril: fix LP64 warnings"
Colin Cross [Thu, 6 Feb 2014 02:55:42 +0000 (18:55 -0800)]
reference-ril: fix LP64 warnings
Use %p to print pointers
Change-Id: I5ad8e349a0dc0b471eb693f87b088edb555a48a7
Jake Hamby [Wed, 15 Jan 2014 21:12:05 +0000 (13:12 -0800)]
Add new RIL commands to read, write, and reset NV items.
Add new RIL commands to read, write, and reset NV items,
including the CDMA Preferred Roaming List (PRL).
Used for device configuration by some CDMA operators.
Bug:
12864208
Change-Id: I792e272438b56bca725e6c034baac19244e5563f
Colin Cross [Sat, 25 Jan 2014 05:56:33 +0000 (05:56 +0000)]
am
eacd3caa: am
2f29fdb8: Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"
* commit '
eacd3caa7a8fc01cedbe82fafd87be131ad231a8':
Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE
Colin Cross [Sat, 25 Jan 2014 05:16:43 +0000 (21:16 -0800)]
am
2f29fdb8: Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"
* commit '
2f29fdb8a8cb7f624801d35ab108f0321030c61b':
Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE
Colin Cross [Sat, 25 Jan 2014 05:11:12 +0000 (05:11 +0000)]
Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"
Colin Cross [Sat, 25 Jan 2014 01:02:19 +0000 (17:02 -0800)]
Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE
64 bit bionic does not define pthread_cond_timeout_np, use
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE to determine whether or
not to use it.
Change-Id: Ia94dd76f7ea4b0268f07049c127342a8bd016ec0
Elliott Hughes [Mon, 6 Jan 2014 22:01:58 +0000 (22:01 +0000)]
am
cc1983a7: am
dcb3334c: Merge "Fix pthread_create error handling in ril harder."
* commit '
cc1983a73ada8546905d6174b0d694b88f5f1916':
Fix pthread_create error handling in ril harder.
Elliott Hughes [Mon, 6 Jan 2014 21:53:08 +0000 (13:53 -0800)]
am
dcb3334c: Merge "Fix pthread_create error handling in ril harder."
* commit '
dcb3334ce57f28a525d7e86222d4c7c6e3907ba3':
Fix pthread_create error handling in ril harder.
Elliott Hughes [Mon, 6 Jan 2014 21:49:08 +0000 (21:49 +0000)]
Merge "Fix pthread_create error handling in ril harder."
Elliott Hughes [Mon, 6 Jan 2014 20:56:51 +0000 (20:56 +0000)]
am
091ed337: am
21538d94: Merge "Fix pthread_create error handling in ril."
* commit '
091ed337b14b6e5bcf35286d8ca5a3457cafa7ce':
Fix pthread_create error handling in ril.
Elliott Hughes [Mon, 6 Jan 2014 20:48:47 +0000 (12:48 -0800)]
am
21538d94: Merge "Fix pthread_create error handling in ril."
* commit '
21538d9410d3d04cc15f08a3a25b5f2501a70f9e':
Fix pthread_create error handling in ril.
Elliott Hughes [Mon, 6 Jan 2014 20:46:02 +0000 (12:46 -0800)]
Fix pthread_create error handling in ril harder.
The previous patch fixed the behavior _if_ something goes wrong...
...but didn't fix the check for whether something went wrong.
pthread_create isn't a regular Unix "return -1 and set errno" kind
of function; it returns 0 on success and an error number (without
setting errno) on failure.
Bug: https://code.google.com/p/android/issues/detail?id=64189
Change-Id: I335af890885d6a672d7bac746fdfea3ed3995360
Elliott Hughes [Mon, 6 Jan 2014 20:44:05 +0000 (20:44 +0000)]
Merge "Fix pthread_create error handling in ril."
Elliott Hughes [Fri, 3 Jan 2014 23:31:42 +0000 (15:31 -0800)]
Fix pthread_create error handling in ril.
Bug: https://code.google.com/p/android/issues/detail?id=64189
Change-Id: Ie6282dda582a574aaad5513c39f2d8d965f6dee3
Wink Saville [Mon, 16 Dec 2013 20:39:01 +0000 (20:39 +0000)]
am
05eb2d71: am
c4801e78: Merge "Fix parameter mismatch between header and implementation"
* commit '
05eb2d71de4caa1226b4b4898414042abfd9d539':
Fix parameter mismatch between header and implementation
Wink Saville [Mon, 16 Dec 2013 20:32:32 +0000 (12:32 -0800)]
am
c4801e78: Merge "Fix parameter mismatch between header and implementation"
* commit '
c4801e78cc7b75a744a45a2a855503daca5bf0f3':
Fix parameter mismatch between header and implementation
Wink Saville [Mon, 16 Dec 2013 20:26:32 +0000 (20:26 +0000)]
Merge "Fix parameter mismatch between header and implementation"
Wink Saville [Mon, 16 Dec 2013 19:58:46 +0000 (19:58 +0000)]
am
169e3195: am
af03f928: Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."
* commit '
169e3195c45cc50ed315a2a48aa80a58818303da':
Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.
Wink Saville [Mon, 16 Dec 2013 19:53:12 +0000 (11:53 -0800)]
am
af03f928: Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."
* commit '
af03f9284c7e775df8feeef6eb96ffb039949e9a':
Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.
Wink Saville [Mon, 16 Dec 2013 19:48:14 +0000 (19:48 +0000)]
Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."
Shishir Agrawal [Mon, 16 Dec 2013 18:10:01 +0000 (10:10 -0800)]
Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.
On error, the RIL implementation should throw an error and the value returned
does not need to be valid.
Change-Id: Idf81e6f7e2aa5e967e97cef402dfd53150b9b183
Wink Saville [Fri, 13 Dec 2013 22:57:23 +0000 (22:57 +0000)]
am
bd7603d8: am
710f0c82: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error."
* commit '
bd7603d8fcb16d039dff2d4e8035a2b5fa73460a':
Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.
Wink Saville [Fri, 13 Dec 2013 19:59:19 +0000 (11:59 -0800)]
am
710f0c82: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error."
* commit '
710f0c82afb8d1660539b74d7f4c137b0644b799':
Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.
Wink Saville [Fri, 13 Dec 2013 19:53:34 +0000 (19:53 +0000)]
Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error."
Shishir Agrawal [Fri, 13 Dec 2013 01:03:12 +0000 (17:03 -0800)]
Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.
Changing the RIL_REQUEST_SIM_OPEN_CHANNEL comment to state that the modem
should return -1 on error and not 0.
Change-Id: Ied71c23857659048f080531b79f98eb9db221c96
Bernhard Rosenkränzer [Thu, 12 Dec 2013 09:01:10 +0000 (10:01 +0100)]
Fix parameter mismatch between header and implementation
RIL_onUnsolicitedResponse's second parameter is
const void *data
according to include/telephony/ril.h and rild/rild.c, but
void *data
according to libril/ril.cpp
This mismatch causes a compile failure with clang (and I'm surprised
it compiles with gcc with the mismatch - probably gcc parses this as
function overloading even though it's extern "C", which wouldn't do
what is expected).
Change-Id: Ib437040aeca4be43cc2d327c3715ffa98c76878c
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Wink Saville [Wed, 11 Dec 2013 23:05:04 +0000 (23:05 +0000)]
am
f0cce223: am
dbff9519: Merge "Send unsol_sim_status on radio_state change"
* commit '
f0cce223bc5e741d7ecc72aa118ee256bd00abb0':
Send unsol_sim_status on radio_state change
Wink Saville [Wed, 11 Dec 2013 22:34:09 +0000 (14:34 -0800)]
am
dbff9519: Merge "Send unsol_sim_status on radio_state change"
* commit '
dbff95192afde6cf20d7d73b716f705329d0da7a':
Send unsol_sim_status on radio_state change
Wink Saville [Wed, 11 Dec 2013 22:29:57 +0000 (22:29 +0000)]
Merge "Send unsol_sim_status on radio_state change"
Alex Yakavenka [Wed, 4 Dec 2013 21:54:37 +0000 (13:54 -0800)]
Send unsol_sim_status on radio_state change
Sim status changes based on radio state.
Need to notify new sim state whenever radio state changes
Change-Id: I8fef3a6ddf601647107e3059f2b2eb89a67242cf
The Android Open Source Project [Fri, 6 Dec 2013 01:43:38 +0000 (01:43 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:27:05 +0000 (17:27 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:38:21 +0000 (12:38 -0800)]
John Huang [Thu, 5 Dec 2013 02:45:28 +0000 (02:45 +0000)]
am
7a74bcfd: am
d78be248: Merge "RIL changes for supporting generic SIM communication."
* commit '
7a74bcfda5a455f872024b34eea1f1eebb5a84d4':
RIL changes for supporting generic SIM communication.
John Huang [Thu, 5 Dec 2013 01:05:52 +0000 (17:05 -0800)]
am
d78be248: Merge "RIL changes for supporting generic SIM communication."
* commit '
d78be248d253e6a5c46749b78d16115d547ab272':
RIL changes for supporting generic SIM communication.
John Huang [Thu, 5 Dec 2013 00:59:42 +0000 (00:59 +0000)]
Merge "RIL changes for supporting generic SIM communication."
Shishir Agrawal [Wed, 27 Nov 2013 22:53:05 +0000 (14:53 -0800)]
RIL changes for supporting generic SIM communication.
The RIL interface adds 4 new commands:
- RIL_REQUEST_SIM_TRANSMIT_BASIC (AT+CSIM - TS 27.007)
- RIL_REQUEST_SIM_OPEN_CHANNEL (AT+CCHO - TS 27.007)
- RIL_REQUEST_SIM_CLOSE_CHANNEL (AT+CCHC - TS 27.007)
- RIL_REQUEST_SIM_TRANSMIT_CHANNEL (AT+CGLA - TS 27.007)
The RIL version is also increased to 10 by this change.
Change-Id: Iee4d950d37a6097493cd945e611c914c40827215
The Android Open Source Project [Sat, 23 Nov 2013 03:31:25 +0000 (19:31 -0800)]
Elliott Hughes [Sat, 23 Nov 2013 03:31:01 +0000 (19:31 -0800)]
am
12131041: am
6a775fe2: am
eb90dbe8: Merge "Remove references to <linux/omap_csmi.h>."
* commit '
121310411fedd2b637a5e6986c10cbf517628b52':
Remove references to <linux/omap_csmi.h>.
The Android Open Source Project [Sat, 23 Nov 2013 01:40:58 +0000 (17:40 -0800)]
The Android Open Source Project [Sat, 23 Nov 2013 00:48:36 +0000 (16:48 -0800)]
Elliott Hughes [Sat, 23 Nov 2013 00:09:17 +0000 (16:09 -0800)]
am
6a775fe2: am
eb90dbe8: Merge "Remove references to <linux/omap_csmi.h>."
* commit '
6a775fe2ff760239ddce5d20813518ef8944d3cc':
Remove references to <linux/omap_csmi.h>.
Elliott Hughes [Sat, 23 Nov 2013 00:05:43 +0000 (16:05 -0800)]
am
eb90dbe8: Merge "Remove references to <linux/omap_csmi.h>."
* commit '
eb90dbe8f53ed85b58e6183b0041426a4bcc64aa':
Remove references to <linux/omap_csmi.h>.
Elliott Hughes [Sat, 23 Nov 2013 00:03:20 +0000 (00:03 +0000)]
Merge "Remove references to <linux/omap_csmi.h>."
Elliott Hughes [Fri, 22 Nov 2013 07:00:03 +0000 (23:00 -0800)]
am
72356f14: am
6b49c024: am
740edfcf: Merge "Remove an outdated hack."
* commit '
72356f14525d260f0e8ed38bd9f8376f535c02d0':
Remove an outdated hack.
Elliott Hughes [Fri, 22 Nov 2013 02:43:52 +0000 (18:43 -0800)]
am
6b49c024: am
740edfcf: Merge "Remove an outdated hack."
* commit '
6b49c02448cf54f5bee6955cb6e42b54febf108e':
Remove an outdated hack.
Elliott Hughes [Fri, 22 Nov 2013 01:12:12 +0000 (17:12 -0800)]
am
a8975de9: am
56865265: am
478bfb9a: Merge "Stop the kernel complaining about rild."
* commit '
a8975de92f1bba7672d447819e7ddc0f08ce8275':
Stop the kernel complaining about rild.
Elliott Hughes [Fri, 22 Nov 2013 01:07:49 +0000 (17:07 -0800)]
am
56865265: am
478bfb9a: Merge "Stop the kernel complaining about rild."
* commit '
568652651ec5121891c80d1096b54ee917550a21':
Stop the kernel complaining about rild.
Elliott Hughes [Thu, 21 Nov 2013 20:48:17 +0000 (12:48 -0800)]
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
Elliott Hughes [Thu, 21 Nov 2013 20:48:43 +0000 (12:48 -0800)]
am
740edfcf: Merge "Remove an outdated hack."
* commit '
740edfcffce965294256bab23c49dcde799dfeda':
Remove an outdated hack.
OSDN Git Service
