| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| * | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-02-01 | 0 | -0/+0 | |
| |\ | ||||||
| | * | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-08 | 0 | -0/+0 | |
| | |\ |/ / | ||||||
| | * | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-10-26 | 0 | -0/+0 | |
| | |\ | ||||||
| | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-23 | 0 | -0/+0 | |
| | | |\ | ||||||
| | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-25 | 0 | -0/+0 | |
| | | | |\ | ||||||
| | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-14 | 0 | -0/+0 | |
| | | | | |\ | ||||||
| | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-02 | 0 | -0/+0 | |
| | | | | | |\ | ||||||
| | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-25 | 0 | -0/+0 | |
| | | | | | | |\ | ||||||
| | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-22 | 0 | -0/+0 | |
| | | | | | | | |\ | ||||||
| | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-17 | 0 | -0/+0 | |
| | | | | | | | | |\ | ||||||
| | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-03 | 0 | -0/+0 | |
| | | | | | | | | | |\ | ||||||
| | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-28 | 0 | -0/+0 | |
| | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-27 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-26 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-22 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-21 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-20 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-07-15 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | | | | | | * | Revert "Patch to decrease the maximum packet size for NFC firmware download" | Nick Pelly | 2011-07-14 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | Use NFC HAL for some libnfc settings. | Martijn Coenen | 2011-11-03 | 6 | -114/+56 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge remote branch 'goog/ics-mr0' into ics-mr1 | Ed Heyl | 2011-10-26 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Use a 10s timeout in uart_read() in FW download mode. | Nick Pelly | 2011-10-25 | 2 | -2/+6 | |
| * | | | | | | | | | | | | | | | | | | | Use a 10s timeout in uart_read() in FW download mode. | Nick Pelly | 2011-10-25 | 2 | -2/+6 | |
| | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaround for Prime (DO NOT MER... | Martijn Coenen | 2011-10-21 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0 | Martijn Coenen | 2011-10-21 | 1 | -35/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Remove NFC I2C workaround for Prime (DO NOT MERGE). | Martijn Coenen | 2011-10-21 | 1 | -35/+5 | |
| | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Fixes to LLC and DAL to handle unreliable UART. | Nick Pelly | 2011-10-21 | 6 | -21/+178 | |
| |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | am 6dd94832: Manual port of 6900b4 from gingerbread: | Rob von Behren | 2011-09-22 | 10 | -336/+1390 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Manual port of 6900b4 from gingerbread: | Rob von Behren | 2011-09-20 | 10 | -336/+1390 | |
| | |/ / / / / / / / / / / / / / / | ||||||
| | | | | | | | | | | | | | | | | | ||||||
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with gingerbread-release gingerbread-mr4-release | The Android Open Source Project | 2011-09-15 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | keep history after reconcile of gingerbread-release | The Android Automerger | 2011-09-12 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | keep history after reset to GRK39D | Ed Heyl | 2011-09-14 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | keep history | android-merger | 2011-09-09 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 ... | Jeff Hamilton | 2011-09-15 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp | Jeff Hamilton | 2011-09-12 | 10 | -373/+1582 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp | Jeff Hamilton | 2011-09-12 | 10 | -373/+1582 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | Patch to add Secure Download Mechanism in the libnfc | Daniel TOMAS | 2011-09-09 | 10 | -373/+1582 | |
| * | | | | | | | | | | | | | | | | | | | | Merge commit 'df34eb0e' into manualmerge | Jeff Hamilton | 2011-09-13 | 3 | -23/+50 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | am dd163fe4: am df82c4dd: Patch to add an API to load a FW image in the libnfc | Daniel TOMAS | 2011-09-09 | 3 | -23/+50 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | am df82c4dd: Patch to add an API to load a FW image in the libnfc | Daniel TOMAS | 2011-09-09 | 3 | -23/+50 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | Patch to add an API to load a FW image in the libnfc | Daniel TOMAS | 2011-09-09 | 3 | -23/+50 | |
| * | | | | | | | | | | | | | | | | | | | Merge "Felica system code related changes" | Martijn Coenen | 2011-09-01 | 6 | -79/+230 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Felica system code related changes | Sunil Jogi | 2011-08-08 | 6 | -79/+230 | |
| * | | | | | | | | | | | | | | | | | | | Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc. | Daniel Tomas | 2011-08-24 | 2 | -2/+67 | |
| * | | | | | | | | | | | | | | | | | | | Fix for removing unnecessary DESELECT before P2P activation in case | Sunil Jogi | 2011-08-24 | 1 | -0/+4 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Revert "Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc." | Nick Pelly | 2011-08-18 | 2 | -67/+2 | |
| | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc. | Daniel Tomas | 2011-08-16 | 2 | -2/+67 | |
| |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Reconcile with gingerbread-mr4-release | The Android Open Source Project | 2011-08-04 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release | The Android Automerger | 2011-08-02 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
 |
index : external_libnfc-nxp.git | |
| external/libnfc-nxp | git repository hosting |
| summaryrefslogtreecommitdiffstats |