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 /include/linux/n_r3964.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/linux/n_r3964.h')
| -rw-r--r-- | include/linux/n_r3964.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/n_r3964.h b/include/linux/n_r3964.h index de24af79ebd3..54b8e0d8d916 100644 --- a/include/linux/n_r3964.h +++ b/include/linux/n_r3964.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright by | 4 | * Copyright by |
| 5 | * Philips Automation Projects | 5 | * Philips Automation Projects |
| 6 | * Kassel (Germany) | 6 | * Kassel (Germany) |
| 7 | * http://www.pap-philips.de | ||
| 8 | * ----------------------------------------------------------- | 7 | * ----------------------------------------------------------- |
| 9 | * This software may be used and distributed according to the terms of | 8 | * This software may be used and distributed according to the terms of |
| 10 | * the GNU General Public License, incorporated herein by reference. | 9 | * the GNU General Public License, incorporated herein by reference. |