diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/arm/00-INDEX | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/arm/00-INDEX')
| -rw-r--r-- | Documentation/arm/00-INDEX | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/arm/00-INDEX b/Documentation/arm/00-INDEX index 7f5fc3ba9c91..91c24a1e8a9e 100644 --- a/Documentation/arm/00-INDEX +++ b/Documentation/arm/00-INDEX | |||
| @@ -6,6 +6,8 @@ Interrupts | |||
| 6 | - ARM Interrupt subsystem documentation | 6 | - ARM Interrupt subsystem documentation |
| 7 | IXP2000 | 7 | IXP2000 |
| 8 | - Release Notes for Linux on Intel's IXP2000 Network Processor | 8 | - Release Notes for Linux on Intel's IXP2000 Network Processor |
| 9 | msm | ||
| 10 | - MSM specific documentation | ||
| 9 | Netwinder | 11 | Netwinder |
| 10 | - Netwinder specific documentation | 12 | - Netwinder specific documentation |
| 11 | Porting | 13 | Porting |
| @@ -32,3 +34,5 @@ memory.txt | |||
| 32 | - description of the virtual memory layout | 34 | - description of the virtual memory layout |
| 33 | nwfpe/ | 35 | nwfpe/ |
| 34 | - NWFPE floating point emulator documentation | 36 | - NWFPE floating point emulator documentation |
| 37 | swp_emulation | ||
| 38 | - SWP/SWPB emulation handler/logging description | ||