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/irqflags-tracing.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/irqflags-tracing.txt')
| -rw-r--r-- | Documentation/irqflags-tracing.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/irqflags-tracing.txt b/Documentation/irqflags-tracing.txt index 6a444877ee0b..67aa71e73035 100644 --- a/Documentation/irqflags-tracing.txt +++ b/Documentation/irqflags-tracing.txt | |||
| @@ -53,5 +53,5 @@ implementation in an architecture: lockdep will detect that and will | |||
| 53 | turn itself off. I.e. the lock validator will still be reliable. There | 53 | turn itself off. I.e. the lock validator will still be reliable. There |
| 54 | should be no crashes due to irq-tracing bugs. (except if the assembly | 54 | should be no crashes due to irq-tracing bugs. (except if the assembly |
| 55 | changes break other code by modifying conditions or registers that | 55 | changes break other code by modifying conditions or registers that |
| 56 | shouldnt be) | 56 | shouldn't be) |
| 57 | 57 | ||