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/stable_api_nonsense.txt | |
| 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/stable_api_nonsense.txt')
| -rw-r--r-- | Documentation/stable_api_nonsense.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/stable_api_nonsense.txt b/Documentation/stable_api_nonsense.txt index 847b342b7b20..db3be892afb2 100644 --- a/Documentation/stable_api_nonsense.txt +++ b/Documentation/stable_api_nonsense.txt | |||
| @@ -122,7 +122,7 @@ operating system to suffer. | |||
| 122 | 122 | ||
| 123 | In both of these instances, all developers agreed that these were | 123 | In both of these instances, all developers agreed that these were |
| 124 | important changes that needed to be made, and they were made, with | 124 | important changes that needed to be made, and they were made, with |
| 125 | relatively little pain. If Linux had to ensure that it preserve a | 125 | relatively little pain. If Linux had to ensure that it will preserve a |
| 126 | stable source interface, a new interface would have been created, and | 126 | stable source interface, a new interface would have been created, and |
| 127 | the older, broken one would have had to be maintained over time, leading | 127 | the older, broken one would have had to be maintained over time, leading |
| 128 | to extra work for the USB developers. Since all Linux USB developers do | 128 | to extra work for the USB developers. Since all Linux USB developers do |